Switch toolchain to gcc 13.2.0 + glibc 2.22

Checkmk · Apr 11, 2024 · 22f1a79 · 22f1a79
1 parent e8185d3
commit 22f1a79
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -51,7 +51,8 @@ gcc_register_toolchain(
 
 gcc_register_toolchain(
     name = "gcc_toolchain_x86_64",
-    sysroot_variant = "x86_64-X11",
+    gcc_version = "13.2.0",
+    sysroot_variant = "x86_64-gcc13",
     target_arch = ARCHS.x86_64,
 )
 

diff --git a/sysroot/Dockerfile b/sysroot/Dockerfile
@@ -49,12 +49,12 @@ RUN curl --fail-early --location https://github.com/torvalds/linux/archive/refs/
 
 FROM base_image AS glibc_download
 WORKDIR /downloads/glibc
-RUN curl --fail-early --location https://ftp.gnu.org/gnu/glibc/glibc-2.26.tar.xz \
+RUN curl --fail-early --location https://ftp.gnu.org/gnu/glibc/glibc-2.22.tar.xz \
         | tar --xz --extract --strip-components=1 --file -
 
 FROM base_image AS gcc_download
 WORKDIR /downloads/gcc
-RUN curl --fail-early --location https://ftp.gnu.org/gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz \
+RUN curl --fail-early --location https://ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz \
         | tar --xz --extract --strip-components=1 --file -
 RUN ./contrib/download_prerequisites
 

diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl
@@ -325,6 +325,11 @@ _SYSROOTS = {
         sha256 = "36caaa7b9445ffe46142becdbce5733843d99efa70ac027ba82c2909f0ae6dc4",
         url = "https://github.com/aspect-build/gcc-toolchain/releases/download/0.3.0/sysroot-X11-x86_64.tar.xz",
     ),
+    "x86_64-gcc13": struct(
+        sha256 = "687f647f8c6c6cf7714111470fd20d3e23c1a1a617e4a95829bb207d0f63bff3",
+        # TODO: This must go into nexus/github
+        url = "file:///home/timotheus/git/gcc-toolchain/sysroot/sysroot-base-x86_64.tar.xz",
+    ),
 }
 
 _TOOLCHAINS = {
@@ -345,6 +350,13 @@ _TOOLCHAINS = {
             url = "https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2021.11-5.tar.bz2",
         ),
     },
+    "13.2.0": {
+        "x86_64": struct(
+            sha256 = "7aac949737ebfb3f4bccc6a75af79d50cf1fadd9ffbdf21e26c1508dff67f23d",
+            strip_prefix = "x86-64--glibc--bleeding-edge-2024.02-1",
+            url = "https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2024.02-1.tar.bz2",
+        ),
+    },
 }
 
 _SYSROOT_BUILD_FILE_CONTENT = """\