@@ -712,7 +712,7 @@ case $host in
712
712
postdeps_CXX=
713
713
714
714
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] )
716
716
;;
717
717
*darwin*)
718
718
TARGET_OS=darwin
@@ -754,7 +754,7 @@ case $host in
754
754
else
755
755
CORE_CPPFLAGS="$CORE_CPPFLAGS -I$miniupnpc_prefix/include"
756
756
fi
757
- LDFLAGS ="$LDFLAGS -L$miniupnpc_prefix/lib"
757
+ CORE_LDFLAGS ="$CORE_LDFLAGS -L$miniupnpc_prefix/lib"
758
758
fi
759
759
if test "$use_natpmp" != "no" && $BREW list --versions libnatpmp >/dev/null; then
760
760
libnatpmp_prefix=$($BREW --prefix libnatpmp 2>/dev/null)
@@ -763,7 +763,7 @@ case $host in
763
763
else
764
764
CORE_CPPFLAGS="$CORE_CPPFLAGS -I$libnatpmp_prefix/include"
765
765
fi
766
- LDFLAGS ="$LDFLAGS -L$libnatpmp_prefix/lib"
766
+ CORE_LDFLAGS ="$CORE_LDFLAGS -L$libnatpmp_prefix/lib"
767
767
fi
768
768
;;
769
769
esac
@@ -789,7 +789,7 @@ case $host in
789
789
esac
790
790
fi
791
791
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] )
793
793
CORE_CPPFLAGS="$CORE_CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
794
794
OBJCXXFLAGS="$CXXFLAGS"
795
795
;;
@@ -853,7 +853,7 @@ if test "$use_lcov" = "yes"; then
853
853
AC_SUBST ( COV_TOOL_WRAPPER , "cov_tool_wrapper.sh" )
854
854
LCOV="$LCOV --gcov-tool $(pwd)/$COV_TOOL_WRAPPER"
855
855
856
- AX_CHECK_LINK_FLAG ( [ --coverage] , [ LDFLAGS ="$LDFLAGS --coverage"] ,
856
+ AX_CHECK_LINK_FLAG ( [ --coverage] , [ CORE_LDFLAGS ="$CORE_LDFLAGS --coverage"] ,
857
857
[ AC_MSG_ERROR ( [ lcov testing requested but --coverage linker flag does not work] ) ] )
858
858
AX_CHECK_COMPILE_FLAG ( [ --coverage] ,[ CXXFLAGS="$CXXFLAGS --coverage"] ,
859
859
[ 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.
970
970
dnl For example: GNU ld will interpret -dead_strip as -de and then try and use
971
971
dnl "ad_strip" as the symbol for the entry point.
972
972
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] )
975
975
AX_CHECK_LINK_FLAG ( [ -Wl,-bind_at_load] , [ HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-bind_at_load"] , [ ] , [ $LDFLAG_WERROR] )
976
976
fi
977
977
@@ -1873,6 +1873,7 @@ AC_SUBST(BITCOIN_MP_NODE_NAME)
1873
1873
AC_SUBST ( BITCOIN_MP_GUI_NAME )
1874
1874
1875
1875
AC_SUBST ( RELDFLAGS )
1876
+ AC_SUBST ( CORE_LDFLAGS )
1876
1877
AC_SUBST ( CORE_CPPFLAGS )
1877
1878
AC_SUBST ( DEBUG_CPPFLAGS )
1878
1879
AC_SUBST ( WARN_CXXFLAGS )
@@ -2008,6 +2009,6 @@ echo " CFLAGS = $PTHREAD_CFLAGS $CFLAGS"
2008
2009
echo " CPPFLAGS = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
2009
2010
echo " CXX = $CXX"
2010
2011
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"
2012
2013
echo " ARFLAGS = $ARFLAGS"
2013
2014
echo
0 commit comments