summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-05-26 07:31:41 +0000
committermidipix <writeonce@midipix.org>2021-05-26 14:37:26 +0000
commit10b5c0f17d5a0d0d8709bea2aa18fdde54edce7d (patch)
treee14b2af4cd3d58c0f000bd354dfa0ac1d5d5dbb9
parent32fde7d6ac3566ef2968a257f093a77b0df5700e (diff)
downloadmdso-10b5c0f17d5a0d0d8709bea2aa18fdde54edce7d.tar.bz2
mdso-10b5c0f17d5a0d0d8709bea2aa18fdde54edce7d.tar.xz
build system: cfgtest framework: support test invocation from within ccenv.sh.
-rw-r--r--sofort/cfgtest/cfgtest.sh22
1 files changed, 15 insertions, 7 deletions
diff --git a/sofort/cfgtest/cfgtest.sh b/sofort/cfgtest/cfgtest.sh
index 736abdd..0b2e9c9 100644
--- a/sofort/cfgtest/cfgtest.sh
+++ b/sofort/cfgtest/cfgtest.sh
@@ -38,7 +38,13 @@ cfgtest_host_section()
{
mb_cfgtest_cc="$ccenv_host_cc"
mb_cfgtest_cfgtype='host'
- mb_cfgtest_cflags=$(${mb_make} -n -f "$mb_pwd/Makefile.tmp" .cflags-host)
+
+ mb_cfgtest_cflags=$(${mb_make} -n -f "$mb_pwd/Makefile.tmp" \
+ OS_DSO_EXRULES=default \
+ OS_SONAME=symlink \
+ OS_ARCHIVE_EXT='.a' \
+ .cflags-host)
+
mb_cfgtest_cflags="${mb_cfgtest_cflags#*: }"
mb_cfgtest_ldflags="$mb_ldflags_cmdline"
@@ -49,20 +55,22 @@ cfgtest_host_section()
mb_cfgtest_ldflags="$mb_cfgtest_ldflags $mb_ldflags_sysroot"
mb_cfgtest_ldflags="$mb_cfgtest_ldflags $mb_ldflags_path"
mb_cfgtest_ldflags="$mb_cfgtest_ldflags $mb_ldflags_last"
-
- cfgtest_comment 'host-specific tests'
}
cfgtest_native_section()
{
- mb_cfgtest_cc="$mb_native_cc"
+ mb_cfgtest_cc="$ccenv_native_cc"
mb_cfgtest_cfgtype='native'
- mb_cfgtest_cflags=$(${mb_make} -n -f "$mb_pwd/Makefile.tmp" .cflags-native)
+
+ mb_cfgtest_cflags=$(${mb_make} -n -f "$mb_pwd/Makefile.tmp" \
+ OS_DSO_EXRULES=default \
+ OS_SONAME=symlink \
+ OS_ARCHIVE_EXT='.a' \
+ .cflags-native)
+
mb_cfgtest_cflags="${mb_cfgtest_cflags#*: }"
mb_cfgtest_ldflags="$mb_native_ldflags"
-
- cfgtest_comment 'native system tests'
}