Skip to content

Commit 2514eb2

Browse files
fanquakePiRK
authored andcommitted
guix: use GCC 13.3.0 for base toolchain.
Summary: This is a backport of [[bitcoin/bitcoin#29881 | core#29881]] Test Plan: guix builds Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D18866
1 parent 60040bd commit 2514eb2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

contrib/guix/manifest.scm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ chain for " target " development."))
9999
(home-page (package-home-page xgcc))
100100
(license (package-license xgcc)))))
101101

102-
(define base-gcc gcc-12) ;; 12.4.0
102+
(define base-gcc gcc-13) ;; 13.3.0
103103

104104
(define base-linux-kernel-headers linux-libre-headers-6.1)
105105

@@ -569,6 +569,7 @@ inspecting signatures in Mach-O binaries.")
569569
xz
570570
zlib
571571
;; Build tools
572+
gcc-toolchain-13
572573
cmake-minimal
573574
ninja
574575
gnu-make
@@ -577,7 +578,6 @@ inspecting signatures in Mach-O binaries.")
577578
automake
578579
pkg-config
579580
bison
580-
gcc-toolchain-12
581581
(list gcc "lib")
582582
;; Scripting
583583
python-minimal ;; (3.10)
@@ -601,7 +601,7 @@ inspecting signatures in Mach-O binaries.")
601601
zip))
602602
((string-contains target "-linux-")
603603
(list
604-
(list gcc-toolchain-12 "static")
604+
(list gcc-toolchain-13 "static")
605605
(make-bitcoin-cross-toolchain target)
606606
clang-18))
607607
((string-contains target "darwin")

src/kernel/caches.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <util/byte_units.h>
99

1010
#include <algorithm>
11+
#include <cstdint>
1112

1213
//! Suggested default amount of cache reserved for the kernel (bytes)
1314
static constexpr int64_t DEFAULT_KERNEL_CACHE{1024_MiB};

0 commit comments

Comments
 (0)