Skip to content

Commit 0d315a5

Browse files
Switch toolchain to gcc 13.2.0 + glibc 2.22
1 parent e8185d3 commit 0d315a5

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

WORKSPACE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ gcc_register_toolchain(
5151

5252
gcc_register_toolchain(
5353
name = "gcc_toolchain_x86_64",
54-
sysroot_variant = "x86_64-X11",
54+
gcc_version = "13.2.0",
55+
sysroot_variant = "x86_64-gcc13",
5556
target_arch = ARCHS.x86_64,
5657
)
5758

sysroot/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ RUN curl --fail-early --location https://github.com/torvalds/linux/archive/refs/
4949

5050
FROM base_image AS glibc_download
5151
WORKDIR /downloads/glibc
52-
RUN curl --fail-early --location https://ftp.gnu.org/gnu/glibc/glibc-2.26.tar.xz \
52+
RUN curl --fail-early --location https://ftp.gnu.org/gnu/glibc/glibc-2.22.tar.xz \
5353
| tar --xz --extract --strip-components=1 --file -
5454

5555
FROM base_image AS gcc_download
5656
WORKDIR /downloads/gcc
57-
RUN curl --fail-early --location https://ftp.gnu.org/gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz \
57+
RUN curl --fail-early --location https://ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz \
5858
| tar --xz --extract --strip-components=1 --file -
5959
RUN ./contrib/download_prerequisites
6060

toolchain/defs.bzl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,10 @@ _SYSROOTS = {
325325
sha256 = "36caaa7b9445ffe46142becdbce5733843d99efa70ac027ba82c2909f0ae6dc4",
326326
url = "https://github.com/aspect-build/gcc-toolchain/releases/download/0.3.0/sysroot-X11-x86_64.tar.xz",
327327
),
328+
"x86_64-gcc13": struct(
329+
sha256 = "687f647f8c6c6cf7714111470fd20d3e23c1a1a617e4a95829bb207d0f63bff3",
330+
url = "https://github.com/Checkmk/gcc-toolchain/releases/download/sys-root-gcc-13.2.0-test/sysroot-base-x86_64.tar.xz",
331+
),
328332
}
329333

330334
_TOOLCHAINS = {
@@ -345,6 +349,13 @@ _TOOLCHAINS = {
345349
url = "https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2021.11-5.tar.bz2",
346350
),
347351
},
352+
"13.2.0": {
353+
"x86_64": struct(
354+
sha256 = "7aac949737ebfb3f4bccc6a75af79d50cf1fadd9ffbdf21e26c1508dff67f23d",
355+
strip_prefix = "x86-64--glibc--bleeding-edge-2024.02-1",
356+
url = "https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2024.02-1.tar.bz2",
357+
),
358+
},
348359
}
349360

350361
_SYSROOT_BUILD_FILE_CONTENT = """\

0 commit comments

Comments
 (0)