From 10b5c0f17d5a0d0d8709bea2aa18fdde54edce7d Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Wed, 26 May 2021 07:31:41 +0000
Subject: build system: cfgtest framework: support test invocation from within
 ccenv.sh.

---
 sofort/cfgtest/cfgtest.sh | 22 +++++++++++++++-------
 1 file 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'
 }
 
 
-- 
cgit v1.2.3