diff options
| author | fanquake <fanquake@gmail.com> | 2023-03-29 12:06:09 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-03-29 12:09:23 +0100 |
| commit | 8e7179aa132598b946d0e03f4ec452edc6ef3bc4 (patch) | |
| tree | 94e3e641fe04a63a6054028e7c20e2c71d13f290 | |
| parent | c0311b1dda278bbbb3e50acbfaf6bdcdbbf8ef11 (diff) | |
| parent | 4133c8104f522c403c55d26bd03436a8149ff106 (diff) | |
| download | bitcoin-8e7179aa132598b946d0e03f4ec452edc6ef3bc4.tar.xz | |
Merge bitcoin/bitcoin#27345: guix: use GCC tool wrappers
4133c8104f522c403c55d26bd03436a8149ff106 guix: use gcc tool wrappers (fanquake)
Pull request description:
This way, correct `--plugin` arguments are passed through.
This is a prerequisite for LTO (see #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](https://github.com/bitcoin/bitcoin/pull/27345/commits/4133c8104f522c403c55d26bd03436a8149ff106)
hebasto:
ACK 4133c8104f522c403c55d26bd03436a8149ff106
Tree-SHA512: 4311a72a613cf027bd4490caa29604c985ed455589acd972285f13cbdf4806d2184a4dc6f20cb6f47c3fa751d58bfd0bacc257b87d4a804bf5ecf5b240e4a757
| -rwxr-xr-x | contrib/guix/libexec/build.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 08a6c72a95..e0bd15493f 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -188,9 +188,9 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \ ${SDK_PATH+SDK_PATH="$SDK_PATH"} \ x86_64_linux_CC=x86_64-linux-gnu-gcc \ x86_64_linux_CXX=x86_64-linux-gnu-g++ \ - x86_64_linux_AR=x86_64-linux-gnu-ar \ - x86_64_linux_RANLIB=x86_64-linux-gnu-ranlib \ - x86_64_linux_NM=x86_64-linux-gnu-nm \ + x86_64_linux_AR=x86_64-linux-gnu-gcc-ar \ + x86_64_linux_RANLIB=x86_64-linux-gnu-gcc-ranlib \ + x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \ x86_64_linux_STRIP=x86_64-linux-gnu-strip \ FORCE_USE_SYSTEM_CLANG=1 |