Skip to content

Commit 407deab

Browse files
committed
merge bitcoin#25612: default to using GCC tool wrappers for LTO (with GCC)
includes: - 6fdc13c continuation of 019c9dd from dash#6384
1 parent f0a0040 commit 407deab

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2014,5 +2014,6 @@ echo " CPPFLAGS = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS
20142014
echo " CXX = $CXX"
20152015
echo " CXXFLAGS = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $CXXFLAGS"
20162016
echo " LDFLAGS = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $LDFLAGS"
2017+
echo " AR = $AR"
20172018
echo " ARFLAGS = $ARFLAGS"
20182019
echo

depends/config.site.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ PYTHONPATH="${depends_prefix}/native/lib/python3/dist-packages${PYTHONPATH:+${PA
101101

102102
if test -n "@AR@"; then
103103
AR="@AR@"
104-
ac_cv_path_ac_pt_AR="${AR}"
104+
ac_cv_path_AR="${AR}"
105105
fi
106106

107107
if test -n "@RANLIB@"; then
@@ -122,12 +122,12 @@ fi
122122
if test "@host_os@" = darwin; then
123123
if test -n "@OBJDUMP@"; then
124124
OBJDUMP="@OBJDUMP@"
125-
ac_cv_path_ac_pt_OBJDUMP="${OBJDUMP}"
125+
ac_cv_path_OBJDUMP="${OBJDUMP}"
126126
fi
127127

128128
if test -n "@DSYMUTIL@"; then
129129
DSYMUTIL="@DSYMUTIL@"
130-
ac_cv_path_ac_pt_DSYMUTIL="${DSYMUTIL}"
130+
ac_cv_path_DSYMUTIL="${DSYMUTIL}"
131131
fi
132132
fi
133133

0 commit comments

Comments
 (0)