Skip to content

Commit 69737c0

Browse files
fanquakePastaPastaPasta
authored andcommitted
Merge bitcoin#27345: guix: use GCC tool wrappers
4133c81 guix: use gcc tool wrappers (fanquake) Pull request description: This way, correct `--plugin` arguments are passed through. This is a prerequisite for LTO (see bitcoin#25391). Split out, to try move things along, as this change is isolated, and should be straight-forward. ACKs for top commit: TheCharlatan: ACK [4133c81](bitcoin@4133c81) hebasto: ACK 4133c81 Tree-SHA512: 4311a72a613cf027bd4490caa29604c985ed455589acd972285f13cbdf4806d2184a4dc6f20cb6f47c3fa751d58bfd0bacc257b87d4a804bf5ecf5b240e4a757
1 parent 30f6c49 commit 69737c0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

contrib/guix/libexec/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \
207207
${SDK_PATH+SDK_PATH="$SDK_PATH"} \
208208
x86_64_linux_CC=x86_64-linux-gnu-gcc \
209209
x86_64_linux_CXX=x86_64-linux-gnu-g++ \
210-
x86_64_linux_AR=x86_64-linux-gnu-ar \
211-
x86_64_linux_RANLIB=x86_64-linux-gnu-ranlib \
212-
x86_64_linux_NM=x86_64-linux-gnu-nm \
210+
x86_64_linux_AR=x86_64-linux-gnu-gcc-ar \
211+
x86_64_linux_RANLIB=x86_64-linux-gnu-gcc-ranlib \
212+
x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \
213213
x86_64_linux_STRIP=x86_64-linux-gnu-strip \
214214
qt_config_opts_x86_64_linux='-platform linux-g++ -xplatform bitcoin-linux-g++' \
215215
FORCE_USE_SYSTEM_CLANG=1

0 commit comments

Comments
 (0)