Skip to content

Commit 3e2ef23

Browse files
committed
build: stop overriding user LDFLAGS
Let the user have the final say in regards to LDFLAGS.
1 parent 35c3fd4 commit 3e2ef23

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

configure.ac

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ case $host in
712712
postdeps_CXX=
713713

714714
dnl We require Windows 7 (NT 6.1) or later
715-
AX_CHECK_LINK_FLAG([-Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1], [LDFLAGS="$LDFLAGS -Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1"], [], [$LDFLAG_WERROR])
715+
AX_CHECK_LINK_FLAG([-Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1"], [], [$LDFLAG_WERROR])
716716
;;
717717
*darwin*)
718718
TARGET_OS=darwin
@@ -754,7 +754,7 @@ case $host in
754754
else
755755
CORE_CPPFLAGS="$CORE_CPPFLAGS -I$miniupnpc_prefix/include"
756756
fi
757-
LDFLAGS="$LDFLAGS -L$miniupnpc_prefix/lib"
757+
CORE_LDFLAGS="$CORE_LDFLAGS -L$miniupnpc_prefix/lib"
758758
fi
759759
if test "$use_natpmp" != "no" && $BREW list --versions libnatpmp >/dev/null; then
760760
libnatpmp_prefix=$($BREW --prefix libnatpmp 2>/dev/null)
@@ -763,7 +763,7 @@ case $host in
763763
else
764764
CORE_CPPFLAGS="$CORE_CPPFLAGS -I$libnatpmp_prefix/include"
765765
fi
766-
LDFLAGS="$LDFLAGS -L$libnatpmp_prefix/lib"
766+
CORE_LDFLAGS="$CORE_LDFLAGS -L$libnatpmp_prefix/lib"
767767
fi
768768
;;
769769
esac
@@ -789,7 +789,7 @@ case $host in
789789
esac
790790
fi
791791

792-
AX_CHECK_LINK_FLAG([-Wl,-headerpad_max_install_names], [LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"], [], [$LDFLAG_WERROR])
792+
AX_CHECK_LINK_FLAG([-Wl,-headerpad_max_install_names], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-headerpad_max_install_names"], [], [$LDFLAG_WERROR])
793793
CORE_CPPFLAGS="$CORE_CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
794794
OBJCXXFLAGS="$CXXFLAGS"
795795
;;
@@ -853,7 +853,7 @@ if test "$use_lcov" = "yes"; then
853853
AC_SUBST(COV_TOOL_WRAPPER, "cov_tool_wrapper.sh")
854854
LCOV="$LCOV --gcov-tool $(pwd)/$COV_TOOL_WRAPPER"
855855

856-
AX_CHECK_LINK_FLAG([--coverage], [LDFLAGS="$LDFLAGS --coverage"],
856+
AX_CHECK_LINK_FLAG([--coverage], [CORE_LDFLAGS="$CORE_LDFLAGS --coverage"],
857857
[AC_MSG_ERROR([lcov testing requested but --coverage linker flag does not work])])
858858
AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
859859
[AC_MSG_ERROR([lcov testing requested but --coverage flag does not work])])
@@ -970,8 +970,8 @@ dnl These flags are specific to ld64, and may cause issues with other linkers.
970970
dnl For example: GNU ld will interpret -dead_strip as -de and then try and use
971971
dnl "ad_strip" as the symbol for the entry point.
972972
if test "$TARGET_OS" = "darwin"; then
973-
AX_CHECK_LINK_FLAG([-Wl,-dead_strip], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"], [], [$LDFLAG_WERROR])
974-
AX_CHECK_LINK_FLAG([-Wl,-dead_strip_dylibs], [LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"], [], [$LDFLAG_WERROR])
973+
AX_CHECK_LINK_FLAG([-Wl,-dead_strip], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-dead_strip"], [], [$LDFLAG_WERROR])
974+
AX_CHECK_LINK_FLAG([-Wl,-dead_strip_dylibs], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-dead_strip_dylibs"], [], [$LDFLAG_WERROR])
975975
AX_CHECK_LINK_FLAG([-Wl,-bind_at_load], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-bind_at_load"], [], [$LDFLAG_WERROR])
976976
fi
977977

@@ -1873,6 +1873,7 @@ AC_SUBST(BITCOIN_MP_NODE_NAME)
18731873
AC_SUBST(BITCOIN_MP_GUI_NAME)
18741874

18751875
AC_SUBST(RELDFLAGS)
1876+
AC_SUBST(CORE_LDFLAGS)
18761877
AC_SUBST(CORE_CPPFLAGS)
18771878
AC_SUBST(DEBUG_CPPFLAGS)
18781879
AC_SUBST(WARN_CXXFLAGS)
@@ -2008,6 +2009,6 @@ echo " CFLAGS = $PTHREAD_CFLAGS $CFLAGS"
20082009
echo " CPPFLAGS = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
20092010
echo " CXX = $CXX"
20102011
echo " CXXFLAGS = $LTO_CXXFLAGS $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CXXFLAGS"
2011-
echo " LDFLAGS = $LTO_LDFLAGS $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $LDFLAGS"
2012+
echo " LDFLAGS = $LTO_LDFLAGS $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $LDFLAGS"
20122013
echo " ARFLAGS = $ARFLAGS"
20132014
echo

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ print-%: FORCE
88

99
DIST_SUBDIRS = secp256k1
1010

11-
AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) $(LTO_LDFLAGS)
11+
AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) $(LTO_LDFLAGS) $(CORE_LDFLAGS)
1212
AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS) $(LTO_CXXFLAGS)
1313
AM_CPPFLAGS = $(DEBUG_CPPFLAGS) $(HARDENED_CPPFLAGS) $(CORE_CPPFLAGS)
1414
AM_LIBTOOLFLAGS = --preserve-dup-deps

0 commit comments

Comments
 (0)