diff options
| author | midipix <writeonce@midipix.org> | 2021-05-26 07:31:41 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2021-05-26 14:37:38 +0000 |
| commit | 40ac7a71e684fc83e2fa0b84a6358179a4bb2021 (patch) | |
| tree | bcc8b2f568a8868c9d1250571b35cd7eed13cebe | |
| parent | 1a3a8edfe0d63d94e3faa8678370cdd2d39692f6 (diff) | |
| download | w32lib-40ac7a71e684fc83e2fa0b84a6358179a4bb2021.tar.bz2 w32lib-40ac7a71e684fc83e2fa0b84a6358179a4bb2021.tar.xz | |
build system: cfgtest framework: support test invocation from within ccenv.sh.
| -rw-r--r-- | sofort/cfgtest/cfgtest.sh | 22 |
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' } |