Skip to content

Commit 8c9ea8a

Browse files
committed
Merge bitcoin/bitcoin#25612: depends: default to using GCC tool wrappers for LTO (with GCC)
658685a depends: default to using GCC tool wrappers (with GCC) (fanquake) 6fdc13c build: Fix autoconf variable names for tools found by `AC_PATH_TOOL` (Hennadii Stepanov) Pull request description: This improves support for LTO by using gcc wrappers for `ar`, `nm`, `ranlib`, that correctly setup plugin arguments for LTO, when using GCC. Other HOSTS are using clang. Portion of #25391. Guix Build (x86_64): ```bash ``` Guix Build (arm64): ```bash ``` ACKs for top commit: dongcarl: Code Review ACK 658685a hebasto: ACK 658685a jarolrod: ACK 658685a Tree-SHA512: 28d6127c118f74336c97e2523117f8a0d11b32cd565124cd4052baeb7cc53e71909d3037cb080d996ae4e3ce600326fced37ee36adcc53d839ba7dd7974ebcd2
2 parents 47c86a0 + 658685a commit 8c9ea8a

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,5 +2049,6 @@ echo " CPPFLAGS = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPP
20492049
echo " CXX = $CXX"
20502050
echo " CXXFLAGS = $LTO_CXXFLAGS $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $CXXFLAGS"
20512051
echo " LDFLAGS = $LTO_LDFLAGS $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $LDFLAGS"
2052+
echo " AR = $AR"
20522053
echo " ARFLAGS = $ARFLAGS"
20532054
echo

depends/config.site.in

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

106106
if test -n "@AR@"; then
107107
AR="@AR@"
108-
ac_cv_path_ac_pt_AR="${AR}"
108+
ac_cv_path_AR="${AR}"
109109
fi
110110

111111
if test -n "@RANLIB@"; then
@@ -126,17 +126,17 @@ fi
126126
if test "@host_os@" = darwin; then
127127
if test -n "@OTOOL@"; then
128128
OTOOL="@OTOOL@"
129-
ac_cv_path_ac_pt_OTOOL="${OTOOL}"
129+
ac_cv_path_OTOOL="${OTOOL}"
130130
fi
131131

132132
if test -n "@INSTALL_NAME_TOOL@"; then
133133
INSTALL_NAME_TOOL="@INSTALL_NAME_TOOL@"
134-
ac_cv_path_ac_pt_INSTALL_NAME_TOOL="${INSTALL_NAME_TOOL}"
134+
ac_cv_path_INSTALL_NAME_TOOL="${INSTALL_NAME_TOOL}"
135135
fi
136136

137137
if test -n "@DSYMUTIL@"; then
138138
DSYMUTIL="@DSYMUTIL@"
139-
ac_cv_path_ac_pt_DSYMUTIL="${DSYMUTIL}"
139+
ac_cv_path_DSYMUTIL="${DSYMUTIL}"
140140
fi
141141
fi
142142

depends/hosts/linux.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ ifneq ($(LTO),)
55
linux_CFLAGS += -flto
66
linux_CXXFLAGS += -flto
77
linux_LDFLAGS += -flto
8+
9+
linux_AR = $(host_toolchain)gcc-ar
10+
linux_NM = $(host_toolchain)gcc-nm
11+
linux_RANLIB = $(host_toolchain)gcc-ranlib
812
endif
913

1014
linux_release_CFLAGS=-O2

depends/hosts/mingw32.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ ifneq ($(LTO),)
99
mingw32_CFLAGS += -flto
1010
mingw32_CXXFLAGS += -flto
1111
mingw32_LDFLAGS += -flto
12+
13+
mingw32_AR = $(host_toolchain)gcc-ar
14+
mingw32_NM = $(host_toolchain)gcc-nm
15+
mingw32_RANLIB = $(host_toolchain)gcc-ranlib
1216
endif
1317

1418
mingw32_release_CFLAGS=-O2

depends/hosts/netbsd.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ ifneq ($(LTO),)
55
netbsd_CFLAGS += -flto
66
netbsd_CXXFLAGS += -flto
77
netbsd_LDFLAGS += -flto
8+
9+
netbsd_AR = $(host_toolchain)gcc-ar
10+
netbsd_NM = $(host_toolchain)gcc-nm
11+
netbsd_RANLIB = $(host_toolchain)gcc-ranlib
812
endif
913

1014
netbsd_CXXFLAGS=$(netbsd_CFLAGS)

0 commit comments

Comments
 (0)