summaryrefslogtreecommitdiff
path: root/sofort/cfgtest
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-06-09 00:53:10 +0000
committermidipix <writeonce@midipix.org>2021-06-09 01:00:26 +0000
commitc76e7163df009d88ee7aaffd0cea69cf9779d822 (patch)
treef17d7202782e38e75fe2cbd4ac61e88b48a976b6 /sofort/cfgtest
parent63e51356bdc18215ff682a100abb171f0b1c98b1 (diff)
downloadtpax-c76e7163df009d88ee7aaffd0cea69cf9779d822.tar.bz2
tpax-c76e7163df009d88ee7aaffd0cea69cf9779d822.tar.xz
build system: cfgtest_{host|native}_section(): properly handle ldflags.
Diffstat (limited to 'sofort/cfgtest')
-rw-r--r--sofort/cfgtest/cfgtest.sh24
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#*: }"
}