diff options
author | midipix <writeonce@midipix.org> | 2021-06-09 00:53:10 +0000 |
---|---|---|
committer | midipix <writeonce@midipix.org> | 2021-06-09 00:53:10 +0000 |
commit | 2bacaa8b3a27d82e9e84cc9f4633f6e8dc11e428 (patch) | |
tree | 27c3715e18668ded927ddbfc8702192bc079f1e5 /sofort | |
parent | 2a3cd2689b976c0abb6a7dc234c698b3e84f3a67 (diff) | |
download | slibtool-2bacaa8b3a27d82e9e84cc9f4633f6e8dc11e428.tar.bz2 slibtool-2bacaa8b3a27d82e9e84cc9f4633f6e8dc11e428.tar.xz |
build system: cfgtest_{host|native}_section(): properly handle ldflags.
Diffstat (limited to 'sofort')
-rw-r--r-- | sofort/cfgtest/cfgtest.sh | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sofort/cfgtest/cfgtest.sh b/sofort/cfgtest/cfgtest.sh index 8d62a08..3a2b0f7 100644 --- a/sofort/cfgtest/cfgtest.sh +++ b/sofort/cfgtest/cfgtest.sh @@ -49,14 +49,13 @@ cfgtest_host_section() mb_cfgtest_cflags="${mb_cfgtest_cflags#*: }" - 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" + mb_cfgtest_ldflags=$(${mb_make} -n -f "$mb_pwd/Makefile.tmp" \ + OS_DSO_EXRULES=default \ + OS_SONAME=symlink \ + OS_ARCHIVE_EXT='.a' \ + .ldflags-host) + + mb_cfgtest_ldflags="${mb_cfgtest_ldflags#*: }" } @@ -74,7 +73,14 @@ cfgtest_native_section() .cflags-native) mb_cfgtest_cflags="${mb_cfgtest_cflags#*: }" - mb_cfgtest_ldflags="$mb_native_ldflags" + + mb_cfgtest_ldflags=$(${mb_make} -n -f "$mb_pwd/Makefile.tmp" \ + OS_DSO_EXRULES=default \ + OS_SONAME=symlink \ + OS_ARCHIVE_EXT='.a' \ + .ldflags-native) + + mb_cfgtest_ldflags="${mb_cfgtest_ldflags#*: }" } |