Skip to content

Commit 785649f

Browse files
committed
Merge bitcoin/bitcoin#29881: guix: use GCC 13 to build releases
0c1b29a ci: use GCC 13 for some jobs (fanquake) cbc65b3 guix: use GCC 13.3.0 for base toolchain. (fanquake) Pull request description: Switch release builds to using GCC 13.3.0: https://gcc.gnu.org/gcc-13/, which landed in Guix in: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=750148ce1ea6c65a7c14424546db0078161f7e17. Does not solve the cross-arch non-determinism for `powerpc64le-linux-gnu` builds. ACKs for top commit: achow101: ACK 0c1b29a hebasto: ACK 0c1b29a. TheCharlatan: Re-ACK 0c1b29a Tree-SHA512: eb3f091278d371166eb1df4718b6d0d68b09db65291d563dddd581964f2b488f901e4ba43831a699e2d0fd053d6e9038a307cbea78d5597da77699c34b440ea6
2 parents 1396400 + 0c1b29a commit 785649f

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

ci/test/00_setup_env_arm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export HOST=arm-linux-gnueabihf
1010
export DPKG_ADD_ARCH="armhf"
1111
export PACKAGES="python3-zmq g++-arm-linux-gnueabihf busybox libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf"
1212
export CONTAINER_NAME=ci_arm_linux
13-
export CI_IMAGE_NAME_TAG="docker.io/debian:bookworm" # Check that https://packages.debian.org/bookworm/g++-arm-linux-gnueabihf (version 12.2, similar to guix) can cross-compile
13+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:noble" # Check that https://packages.ubuntu.com/noble/g++-arm-linux-gnueabihf (version 13.3, similar to guix) can cross-compile
1414
export CI_IMAGE_PLATFORM="linux/arm64"
1515
export USE_BUSY_BOX=true
1616
export RUN_UNIT_TESTS=true

ci/test/00_setup_env_win64.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_win64
10-
export CI_IMAGE_NAME_TAG="docker.io/debian:bookworm" # Check that https://packages.debian.org/bookworm/g++-mingw-w64-x86-64-posix (version 12.2, similar to guix) can cross-compile
10+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:noble" # Check that g++-mingw-w64-x86-64-posix (version 13.2, similar to guix) can cross-compile
1111
export CI_IMAGE_PLATFORM="linux/amd64"
1212
export HOST=x86_64-w64-mingw32
1313
export DPKG_ADD_ARCH="i386"
@@ -17,8 +17,5 @@ export PACKAGES="nsis g++-mingw-w64-x86-64-posix wine-binfmt wine64 wine32 file"
1717
export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-false}
1818
export RUN_FUNCTIONAL_TESTS=false
1919
export GOAL="deploy"
20-
# Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when
21-
# cross-compiling for Windows. https://sourceforge.net/p/mingw-w64/bugs/306/
22-
# https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe
2320
export BITCOIN_CONFIG="-DREDUCE_EXPORTS=ON -DBUILD_GUI_TESTS=OFF \
24-
-DCMAKE_CXX_FLAGS='-Wno-error=return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
21+
-DCMAKE_CXX_FLAGS='-Wno-error=maybe-uninitialized -Wno-error=array-bounds'"

contrib/guix/manifest.scm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ chain for " target " development."))
9090
(home-page (package-home-page xgcc))
9191
(license (package-license xgcc)))))
9292

93-
(define base-gcc gcc-12) ;; 12.4.0
93+
(define base-gcc gcc-13) ;; 13.3.0
9494

9595
(define base-linux-kernel-headers linux-libre-headers-6.1)
9696

@@ -542,7 +542,7 @@ inspecting signatures in Mach-O binaries.")
542542
gzip
543543
xz
544544
;; Build tools
545-
gcc-toolchain-12
545+
gcc-toolchain-13
546546
cmake-minimal
547547
gnu-make
548548
;; Scripting
@@ -561,7 +561,7 @@ inspecting signatures in Mach-O binaries.")
561561
((string-contains target "-linux-")
562562
(list bison
563563
pkg-config
564-
(list gcc-toolchain-12 "static")
564+
(list gcc-toolchain-13 "static")
565565
(make-bitcoin-cross-toolchain target)))
566566
((string-contains target "darwin")
567567
(list clang-toolchain-18

0 commit comments

Comments
 (0)