diff options
| author | midipix <writeonce@midipix.org> | 2021-04-11 19:40:03 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2021-04-11 20:58:05 +0000 |
| commit | ae971093ccfeb117856f507640226291860f65c3 (patch) | |
| tree | 209c4764651760d31f52fef09071bce650f2dba7 /sofort/cfgtest | |
| parent | 6591b281b7c33a3f6b4402c23e1efa8eec65f764 (diff) | |
| download | sofort-ae971093ccfeb117856f507640226291860f65c3.tar.bz2 sofort-ae971093ccfeb117856f507640226291860f65c3.tar.xz | |
build system: cfgtest.sh: refactored and enhanced cfgtest_library_presence().
Diffstat (limited to 'sofort/cfgtest')
| -rw-r--r-- | sofort/cfgtest/cfgtest.sh | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/sofort/cfgtest/cfgtest.sh b/sofort/cfgtest/cfgtest.sh index 7d18a62..f030cd3 100644 --- a/sofort/cfgtest/cfgtest.sh +++ b/sofort/cfgtest/cfgtest.sh @@ -40,6 +40,15 @@ cfgtest_host_section() mb_cfgtest_cfgtype='host' mb_cfgtest_cflags=$(make -s -f "$mb_pwd/Makefile.tmp" .cflags-host) + mb_cfgtest_ldflags="$mb_ldflags_cmdline" + mb_cfgtest_ldflags="$mb_cfgtest_ldflags $mb_ldflags_debug" + mb_cfgtest_ldflags="$mb_cfgtest_ldflags $mb_ldflags_common" + mb_cfgtest_ldflags="$mb_cfgtest_ldflags $mb_ldflags_strict" + mb_cfgtest_ldflags="$mb_cfgtest_ldflags $mb_ldflags_config" + 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' } @@ -49,6 +58,7 @@ cfgtest_native_section() mb_cfgtest_cc="$mb_native_cc" mb_cfgtest_cfgtype='native' mb_cfgtest_cflags=$(make -s -f "$mb_pwd/Makefile.tmp" .cflags-native) + mb_cfgtest_ldflags="$mb_native_ldflags" cfgtest_comment 'native system tests' } @@ -490,14 +500,9 @@ cfgtest_library_presence() printf '\n\n' >&3 - cfgtest_cmd=$(printf '%s -o a.out -xc - %s' \ - "$mb_cfgtest_cc" "$mb_cfgtest_cflags") - - if [ "$mb_cfgtest_cfgtype" = 'native' ]; then - cfgtest_cmd="$cfgtest_cmd ${mb_native_ldflags} $cfgtest_libs" - else - cfgtest_cmd="$cfgtest_cmd -L${mb_libdir} $cfgtest_libs" - fi + cfgtest_cmd=$(printf '%s -o a.out -xc - %s %s %s' \ + "$mb_cfgtest_cc" "$mb_cfgtest_cflags" \ + "$mb_cfgtest_ldflags" "$cfgtest_libs") printf '%s' "$cfgtest_code_snippet" \ | $(printf '%s' "$cfgtest_cmd") \ |