Regenerate linux toolchains from fd9ec00

[skip ci] docker/ubuntu: Decrease gcc/g++ -> 11 (#306) Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Dec 20, 2023 · 157af2c · 157af2c
1 parent fd9ec00
commit 157af2c
Show file tree

Hide file tree

Showing 9 changed files with 2,459 additions and 2,513 deletions.
diff --git a/toolchains/configs/linux/clang/cc/BUILD b/toolchains/configs/linux/clang/cc/BUILD
@@ -85,9 +85,9 @@ cc_toolchain_config(
     "/usr/include/x86_64-linux-gnu",
     "/usr/include",
     "/opt/llvm/lib/clang/14.0.0/share",
-    "/usr/include/c++/13",
-    "/usr/include/x86_64-linux-gnu/c++/13",
-    "/usr/include/c++/13/backward",
+    "/usr/include/c++/11",
+    "/usr/include/x86_64-linux-gnu/c++/11",
+    "/usr/include/c++/11/backward",
     "/opt/llvm/include/x86_64-unknown-linux-gnu/c++/v1",
     "/opt/llvm/include/c++/v1"],
     tool_paths = {"ar": "/usr/bin/ar",

diff --git a/toolchains/configs/linux/clang/cc/builtin_include_directory_paths b/toolchains/configs/linux/clang/cc/builtin_include_directory_paths
@@ -9,8 +9,8 @@ declared action inputs or the action commandline changes.
 /usr/include/x86_64-linux-gnu
 /usr/include
 /opt/llvm/lib/clang/14.0.0/share
-/usr/include/c++/13
-/usr/include/x86_64-linux-gnu/c++/13
-/usr/include/c++/13/backward
+/usr/include/c++/11
+/usr/include/x86_64-linux-gnu/c++/11
+/usr/include/c++/11/backward
 /opt/llvm/include/x86_64-unknown-linux-gnu/c++/v1
 /opt/llvm/include/c++/v1
diff --git a/toolchains/configs/linux/clang/cc/module.modulemap b/toolchains/configs/linux/clang/cc/module.modulemap
diff --git a/toolchains/configs/linux/clang/config/BUILD b/toolchains/configs/linux/clang/config/BUILD
@@ -42,7 +42,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:0b187cc3168ed50a5914bee98696990ba1df8163bf7b6f9047eca3532625a303",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:b0c0e07c97337fdd56423ddd6749a4250adaea9f66f85763a8d9cec36162c972",
         "OSFamily": "Linux",
     },
 )
diff --git a/toolchains/configs/linux/clang_libcxx/cc/module.modulemap b/toolchains/configs/linux/clang_libcxx/cc/module.modulemap
diff --git a/toolchains/configs/linux/clang_libcxx/config/BUILD b/toolchains/configs/linux/clang_libcxx/config/BUILD
@@ -42,7 +42,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:0b187cc3168ed50a5914bee98696990ba1df8163bf7b6f9047eca3532625a303",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:b0c0e07c97337fdd56423ddd6749a4250adaea9f66f85763a8d9cec36162c972",
         "OSFamily": "Linux",
     },
 )
diff --git a/toolchains/configs/linux/gcc/cc/BUILD b/toolchains/configs/linux/gcc/cc/BUILD
@@ -80,13 +80,13 @@ cc_toolchain_config(
     target_libc = "local",
     abi_version = "local",
     abi_libc_version = "local",
-    cxx_builtin_include_directories = ["/usr/lib/gcc/x86_64-linux-gnu/13/include",
+    cxx_builtin_include_directories = ["/usr/lib/gcc/x86_64-linux-gnu/11/include",
     "/usr/local/include",
     "/usr/include/x86_64-linux-gnu",
     "/usr/include",
-    "/usr/include/c++/13",
-    "/usr/include/x86_64-linux-gnu/c++/13",
-    "/usr/include/c++/13/backward"],
+    "/usr/include/c++/11",
+    "/usr/include/x86_64-linux-gnu/c++/11",
+    "/usr/include/c++/11/backward"],
     tool_paths = {"ar": "/usr/bin/ar",
         "ld": "/usr/bin/ld",
         "llvm-cov": "/opt/llvm/bin/llvm-cov",

diff --git a/toolchains/configs/linux/gcc/cc/builtin_include_directory_paths b/toolchains/configs/linux/gcc/cc/builtin_include_directory_paths
@@ -4,10 +4,10 @@ changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
 
-/usr/lib/gcc/x86_64-linux-gnu/13/include
+/usr/lib/gcc/x86_64-linux-gnu/11/include
 /usr/local/include
 /usr/include/x86_64-linux-gnu
 /usr/include
-/usr/include/c++/13
-/usr/include/x86_64-linux-gnu/c++/13
-/usr/include/c++/13/backward
+/usr/include/c++/11
+/usr/include/x86_64-linux-gnu/c++/11
+/usr/include/c++/11/backward
diff --git a/toolchains/configs/linux/gcc/config/BUILD b/toolchains/configs/linux/gcc/config/BUILD
@@ -42,7 +42,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:0b187cc3168ed50a5914bee98696990ba1df8163bf7b6f9047eca3532625a303",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:b0c0e07c97337fdd56423ddd6749a4250adaea9f66f85763a8d9cec36162c972",
         "OSFamily": "Linux",
     },
 )