From fe22613ae3798f438447767b7ee7a8d0759e2c4d Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 9 Jun 2021 00:53:10 +0000 Subject: build system: cfgtest_{host|native}_section(): properly handle ldflags. --- Makefile.in | 6 ++++++ sofort/cfgtest/cfgtest.sh | 24 +++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index 05015f2..a8c18b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -149,6 +149,12 @@ install-app-extras: .cflags-native: @true : $(NATIVE_CFLAGS) +.ldflags-host: + @true : $(LDFLAGS) + +.ldflags-native: + @true : $(NATIVE_LDFLAGS) + include ./ccenv/host.mk include ./ccenv/native.mk 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#*: }" } -- cgit v1.2.3