|
|
@ -712,7 +712,7 @@ case $host in
|
|
|
|
postdeps_CXX=
|
|
|
|
postdeps_CXX=
|
|
|
|
|
|
|
|
|
|
|
|
dnl We require Windows 7 (NT 6.1) or later
|
|
|
|
dnl We require Windows 7 (NT 6.1) or later
|
|
|
|
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])
|
|
|
|
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])
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*darwin*)
|
|
|
|
*darwin*)
|
|
|
|
TARGET_OS=darwin
|
|
|
|
TARGET_OS=darwin
|
|
|
@ -754,7 +754,7 @@ case $host in
|
|
|
|
else
|
|
|
|
else
|
|
|
|
CORE_CPPFLAGS="$CORE_CPPFLAGS -I$miniupnpc_prefix/include"
|
|
|
|
CORE_CPPFLAGS="$CORE_CPPFLAGS -I$miniupnpc_prefix/include"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
LDFLAGS="$LDFLAGS -L$miniupnpc_prefix/lib"
|
|
|
|
CORE_LDFLAGS="$CORE_LDFLAGS -L$miniupnpc_prefix/lib"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$use_natpmp" != "no" && $BREW list --versions libnatpmp >/dev/null; then
|
|
|
|
if test "$use_natpmp" != "no" && $BREW list --versions libnatpmp >/dev/null; then
|
|
|
|
libnatpmp_prefix=$($BREW --prefix libnatpmp 2>/dev/null)
|
|
|
|
libnatpmp_prefix=$($BREW --prefix libnatpmp 2>/dev/null)
|
|
|
@ -763,7 +763,7 @@ case $host in
|
|
|
|
else
|
|
|
|
else
|
|
|
|
CORE_CPPFLAGS="$CORE_CPPFLAGS -I$libnatpmp_prefix/include"
|
|
|
|
CORE_CPPFLAGS="$CORE_CPPFLAGS -I$libnatpmp_prefix/include"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
LDFLAGS="$LDFLAGS -L$libnatpmp_prefix/lib"
|
|
|
|
CORE_LDFLAGS="$CORE_LDFLAGS -L$libnatpmp_prefix/lib"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
@ -789,7 +789,7 @@ case $host in
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
AX_CHECK_LINK_FLAG([-Wl,-headerpad_max_install_names], [LDFLAGS="$LDFLAGS -Wl,-headerpad_max_install_names"], [], [$LDFLAG_WERROR])
|
|
|
|
AX_CHECK_LINK_FLAG([-Wl,-headerpad_max_install_names], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-headerpad_max_install_names"], [], [$LDFLAG_WERROR])
|
|
|
|
CORE_CPPFLAGS="$CORE_CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
|
|
|
|
CORE_CPPFLAGS="$CORE_CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0"
|
|
|
|
OBJCXXFLAGS="$CXXFLAGS"
|
|
|
|
OBJCXXFLAGS="$CXXFLAGS"
|
|
|
|
;;
|
|
|
|
;;
|
|
|
@ -853,7 +853,7 @@ if test "$use_lcov" = "yes"; then
|
|
|
|
AC_SUBST(COV_TOOL_WRAPPER, "cov_tool_wrapper.sh")
|
|
|
|
AC_SUBST(COV_TOOL_WRAPPER, "cov_tool_wrapper.sh")
|
|
|
|
LCOV="$LCOV --gcov-tool $(pwd)/$COV_TOOL_WRAPPER"
|
|
|
|
LCOV="$LCOV --gcov-tool $(pwd)/$COV_TOOL_WRAPPER"
|
|
|
|
|
|
|
|
|
|
|
|
AX_CHECK_LINK_FLAG([--coverage], [LDFLAGS="$LDFLAGS --coverage"],
|
|
|
|
AX_CHECK_LINK_FLAG([--coverage], [CORE_LDFLAGS="$CORE_LDFLAGS --coverage"],
|
|
|
|
[AC_MSG_ERROR([lcov testing requested but --coverage linker flag does not work])])
|
|
|
|
[AC_MSG_ERROR([lcov testing requested but --coverage linker flag does not work])])
|
|
|
|
AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
|
|
|
|
AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
|
|
|
|
[AC_MSG_ERROR([lcov testing requested but --coverage flag does not work])])
|
|
|
|
[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.
|
|
|
|
dnl For example: GNU ld will interpret -dead_strip as -de and then try and use
|
|
|
|
dnl For example: GNU ld will interpret -dead_strip as -de and then try and use
|
|
|
|
dnl "ad_strip" as the symbol for the entry point.
|
|
|
|
dnl "ad_strip" as the symbol for the entry point.
|
|
|
|
if test "$TARGET_OS" = "darwin"; then
|
|
|
|
if test "$TARGET_OS" = "darwin"; then
|
|
|
|
AX_CHECK_LINK_FLAG([-Wl,-dead_strip], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"], [], [$LDFLAG_WERROR])
|
|
|
|
AX_CHECK_LINK_FLAG([-Wl,-dead_strip], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-dead_strip"], [], [$LDFLAG_WERROR])
|
|
|
|
AX_CHECK_LINK_FLAG([-Wl,-dead_strip_dylibs], [LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"], [], [$LDFLAG_WERROR])
|
|
|
|
AX_CHECK_LINK_FLAG([-Wl,-dead_strip_dylibs], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,-dead_strip_dylibs"], [], [$LDFLAG_WERROR])
|
|
|
|
AX_CHECK_LINK_FLAG([-Wl,-bind_at_load], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-bind_at_load"], [], [$LDFLAG_WERROR])
|
|
|
|
AX_CHECK_LINK_FLAG([-Wl,-bind_at_load], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-bind_at_load"], [], [$LDFLAG_WERROR])
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
@ -1873,6 +1873,7 @@ AC_SUBST(BITCOIN_MP_NODE_NAME)
|
|
|
|
AC_SUBST(BITCOIN_MP_GUI_NAME)
|
|
|
|
AC_SUBST(BITCOIN_MP_GUI_NAME)
|
|
|
|
|
|
|
|
|
|
|
|
AC_SUBST(RELDFLAGS)
|
|
|
|
AC_SUBST(RELDFLAGS)
|
|
|
|
|
|
|
|
AC_SUBST(CORE_LDFLAGS)
|
|
|
|
AC_SUBST(CORE_CPPFLAGS)
|
|
|
|
AC_SUBST(CORE_CPPFLAGS)
|
|
|
|
AC_SUBST(DEBUG_CPPFLAGS)
|
|
|
|
AC_SUBST(DEBUG_CPPFLAGS)
|
|
|
|
AC_SUBST(WARN_CXXFLAGS)
|
|
|
|
AC_SUBST(WARN_CXXFLAGS)
|
|
|
@ -2008,6 +2009,6 @@ echo " CFLAGS = $PTHREAD_CFLAGS $CFLAGS"
|
|
|
|
echo " CPPFLAGS = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
|
|
|
|
echo " CPPFLAGS = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
|
|
|
|
echo " CXX = $CXX"
|
|
|
|
echo " CXX = $CXX"
|
|
|
|
echo " CXXFLAGS = $LTO_CXXFLAGS $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CXXFLAGS"
|
|
|
|
echo " CXXFLAGS = $LTO_CXXFLAGS $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CXXFLAGS"
|
|
|
|
echo " LDFLAGS = $LTO_LDFLAGS $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $LDFLAGS"
|
|
|
|
echo " LDFLAGS = $LTO_LDFLAGS $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $LDFLAGS"
|
|
|
|
echo " ARFLAGS = $ARFLAGS"
|
|
|
|
echo " ARFLAGS = $ARFLAGS"
|
|
|
|
echo
|
|
|
|
echo
|
|
|
|