diff options
| author | midipix <writeonce@midipix.org> | 2021-06-09 00:53:10 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2021-06-09 01:00:19 +0000 |
| commit | a68d55476a321d6d9ee33781c338af445bee62e0 (patch) | |
| tree | 2b7107961a8290bad2f4d8bb682c8b987a373f6f /sofort/cfgtest | |
| parent | d312af2cce54048baf62c9f39d0c5c0a6a74b489 (diff) | |
| download | ntcon-a68d55476a321d6d9ee33781c338af445bee62e0.tar.bz2 ntcon-a68d55476a321d6d9ee33781c338af445bee62e0.tar.xz | |
build system: cfgtest_{host|native}_section(): properly handle ldflags.
Diffstat (limited to 'sofort/cfgtest')
| -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#*: }" } |