Commit - framework/w32lib - 6541622c4ad1f01dcd419709ca96eecd52342918

raw patch tree parent

2 files changed. 21 lines added. 9 lines removed.

    build system: cfgtest_{host|native}_section(): properly handle ldflags.

Makefile.in

file modified

+6 -0

Makefile.in CHANGED

@@ -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

sofort/cfgtest/cfgtest.sh

file modified

+15 -9

sofort/cfgtest/cfgtest.sh CHANGED

@@ -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_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#*: }"
-    mb_cfgtest_ldflags="$mb_cfgtest_ldflags $mb_ldflags_last"
 }
@@ -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#*: }"
 }