Regenerate windows toolchains from 2fc9d87

[skip ci] Regenerate linux toolchains from 16d0083 [skip ci] build 3.7.2 bazel toolchains (#114) Build with envoy toolchain for bazel 3.7.2. Follow this to adopt bazel 3.7.2 for envoy upon its release then we will bump /bazelbuild/envoy/WORKSPACE to pick up bazel 3.7.2 and validate then we wait hours for all builds in flight before proceeding to add llvm 11.0.0 in Windows to a rebuild of the 3.7.2 envoy build tools alone Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com> Co-authored-by: Sunjay Bhatia <sunjayb@vmware.com>
envoyproxy · Dec 17, 2020 · 8f11855 · 8f11855
1 parent 2fc9d87
commit 8f11855
Show file tree

Hide file tree

Showing 26 changed files with 10 additions and 10 deletions.
diff --git a/toolchains/configs/windows/.latest.bazelrc b/toolchains/configs/windows/.latest.bazelrc
@@ -19,13 +19,13 @@
 # Specifically, it includes all toolchain/platform flags
 # This file is used for testing purposes.
 
-build:remote --host_javabase=//toolchains/configs/windows/clang-cl/bazel_3.7.0/java:jdk
-build:remote --javabase=//toolchains/configs/windows/clang-cl/bazel_3.7.0/java:jdk
-build:remote --crosstool_top=//toolchains/configs/windows/clang-cl/bazel_3.7.0/cc:toolchain
-build:remote --extra_toolchains=//toolchains/configs/windows/clang-cl/bazel_3.7.0/config:cc-toolchain
-build:remote --extra_execution_platforms=//toolchains/configs/windows/clang-cl/bazel_3.7.0/config:platform
-build:remote --host_platform=//toolchains/configs/windows/clang-cl/bazel_3.7.0/config:platform
-build:remote --platforms=//toolchains/configs/windows/clang-cl/bazel_3.7.0/config:platform
+build:remote --host_javabase=//toolchains/configs/windows/clang-cl/bazel_3.7.2/java:jdk
+build:remote --javabase=//toolchains/configs/windows/clang-cl/bazel_3.7.2/java:jdk
+build:remote --crosstool_top=//toolchains/configs/windows/clang-cl/bazel_3.7.2/cc:toolchain
+build:remote --extra_toolchains=//toolchains/configs/windows/clang-cl/bazel_3.7.2/config:cc-toolchain
+build:remote --extra_execution_platforms=//toolchains/configs/windows/clang-cl/bazel_3.7.2/config:platform
+build:remote --host_platform=//toolchains/configs/windows/clang-cl/bazel_3.7.2/config:platform
+build:remote --platforms=//toolchains/configs/windows/clang-cl/bazel_3.7.2/config:platform
 
 # Import the default bazelrc file in bazel-toolchains repo.
 # This will only work for tests executed from bazel-toolchains

diff --git a/...igs/windows/clang-cl/bazel_3.7.0/cc/BUILD → ...igs/windows/clang-cl/bazel_3.7.2/cc/BUILD b/...igs/windows/clang-cl/bazel_3.7.0/cc/BUILD → ...igs/windows/clang-cl/bazel_3.7.2/cc/BUILD
diff --git a/..._3.7.0/cc/armeabi_cc_toolchain_config.bzl → ..._3.7.2/cc/armeabi_cc_toolchain_config.bzl b/..._3.7.0/cc/armeabi_cc_toolchain_config.bzl → ..._3.7.2/cc/armeabi_cc_toolchain_config.bzl
diff --git a/...c/builtin_include_directory_paths_clangcl → ...c/builtin_include_directory_paths_clangcl b/...c/builtin_include_directory_paths_clangcl → ...c/builtin_include_directory_paths_clangcl
diff --git a/.../cc/builtin_include_directory_paths_mingw → .../cc/builtin_include_directory_paths_mingw b/.../cc/builtin_include_directory_paths_mingw → .../cc/builtin_include_directory_paths_mingw
diff --git a/...0/cc/builtin_include_directory_paths_msvc → ...2/cc/builtin_include_directory_paths_msvc b/...0/cc/builtin_include_directory_paths_msvc → ...2/cc/builtin_include_directory_paths_msvc
diff --git a/...ndows/clang-cl/bazel_3.7.0/cc/get_env.bat → ...ndows/clang-cl/bazel_3.7.2/cc/get_env.bat b/...ndows/clang-cl/bazel_3.7.0/cc/get_env.bat → ...ndows/clang-cl/bazel_3.7.2/cc/get_env.bat
diff --git a/..._3.7.0/cc/msys_gcc_installation_error.bat → ..._3.7.2/cc/msys_gcc_installation_error.bat b/..._3.7.0/cc/msys_gcc_installation_error.bat → ..._3.7.2/cc/msys_gcc_installation_error.bat
diff --git a/...el_3.7.0/cc/vc_installation_error_arm.bat → ...el_3.7.2/cc/vc_installation_error_arm.bat b/...el_3.7.0/cc/vc_installation_error_arm.bat → ...el_3.7.2/cc/vc_installation_error_arm.bat
diff --git a/..._3.7.0/cc/vc_installation_error_arm64.bat → ..._3.7.2/cc/vc_installation_error_arm64.bat b/..._3.7.0/cc/vc_installation_error_arm64.bat → ..._3.7.2/cc/vc_installation_error_arm64.bat
diff --git a/...el_3.7.0/cc/vc_installation_error_x86.bat → ...el_3.7.2/cc/vc_installation_error_x86.bat b/...el_3.7.0/cc/vc_installation_error_x86.bat → ...el_3.7.2/cc/vc_installation_error_x86.bat
diff --git a/..._3.7.0/cc/windows_cc_toolchain_config.bzl → ..._3.7.2/cc/windows_cc_toolchain_config.bzl b/..._3.7.0/cc/windows_cc_toolchain_config.bzl → ..._3.7.2/cc/windows_cc_toolchain_config.bzl
diff --git a/...windows/clang-cl/bazel_3.7.0/config/BUILD → ...windows/clang-cl/bazel_3.7.2/config/BUILD b/...windows/clang-cl/bazel_3.7.0/config/BUILD → ...windows/clang-cl/bazel_3.7.2/config/BUILD
@@ -28,7 +28,7 @@ toolchain(
         "@bazel_tools//platforms:windows",
         "@bazel_tools//platforms:x86_64",
     ],
-    toolchain = "//toolchains/configs/windows/clang-cl/bazel_3.7.0/cc:cc-compiler-x64_windows",
+    toolchain = "//toolchains/configs/windows/clang-cl/bazel_3.7.2/cc:cc-compiler-x64_windows",
     toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
 )
 

diff --git a/...figs/windows/msvc-cl/bazel_3.7.0/cc/BUILD → ...figs/windows/msvc-cl/bazel_3.7.2/cc/BUILD b/...figs/windows/msvc-cl/bazel_3.7.0/cc/BUILD → ...figs/windows/msvc-cl/bazel_3.7.2/cc/BUILD
diff --git a/..._3.7.0/cc/armeabi_cc_toolchain_config.bzl → ..._3.7.2/cc/armeabi_cc_toolchain_config.bzl b/..._3.7.0/cc/armeabi_cc_toolchain_config.bzl → ..._3.7.2/cc/armeabi_cc_toolchain_config.bzl
diff --git a/...c/builtin_include_directory_paths_clangcl → ...c/builtin_include_directory_paths_clangcl b/...c/builtin_include_directory_paths_clangcl → ...c/builtin_include_directory_paths_clangcl
diff --git a/.../cc/builtin_include_directory_paths_mingw → .../cc/builtin_include_directory_paths_mingw b/.../cc/builtin_include_directory_paths_mingw → .../cc/builtin_include_directory_paths_mingw
diff --git a/...0/cc/builtin_include_directory_paths_msvc → ...2/cc/builtin_include_directory_paths_msvc b/...0/cc/builtin_include_directory_paths_msvc → ...2/cc/builtin_include_directory_paths_msvc
diff --git a/...indows/msvc-cl/bazel_3.7.0/cc/get_env.bat → ...indows/msvc-cl/bazel_3.7.2/cc/get_env.bat b/...indows/msvc-cl/bazel_3.7.0/cc/get_env.bat → ...indows/msvc-cl/bazel_3.7.2/cc/get_env.bat
diff --git a/..._3.7.0/cc/msys_gcc_installation_error.bat → ..._3.7.2/cc/msys_gcc_installation_error.bat b/..._3.7.0/cc/msys_gcc_installation_error.bat → ..._3.7.2/cc/msys_gcc_installation_error.bat
diff --git a/...el_3.7.0/cc/vc_installation_error_arm.bat → ...el_3.7.2/cc/vc_installation_error_arm.bat b/...el_3.7.0/cc/vc_installation_error_arm.bat → ...el_3.7.2/cc/vc_installation_error_arm.bat
diff --git a/..._3.7.0/cc/vc_installation_error_arm64.bat → ..._3.7.2/cc/vc_installation_error_arm64.bat b/..._3.7.0/cc/vc_installation_error_arm64.bat → ..._3.7.2/cc/vc_installation_error_arm64.bat
diff --git a/...el_3.7.0/cc/vc_installation_error_x86.bat → ...el_3.7.2/cc/vc_installation_error_x86.bat b/...el_3.7.0/cc/vc_installation_error_x86.bat → ...el_3.7.2/cc/vc_installation_error_x86.bat
diff --git a/..._3.7.0/cc/windows_cc_toolchain_config.bzl → ..._3.7.2/cc/windows_cc_toolchain_config.bzl b/..._3.7.0/cc/windows_cc_toolchain_config.bzl → ..._3.7.2/cc/windows_cc_toolchain_config.bzl
diff --git a/.../windows/msvc-cl/bazel_3.7.0/config/BUILD → .../windows/msvc-cl/bazel_3.7.2/config/BUILD b/.../windows/msvc-cl/bazel_3.7.0/config/BUILD → .../windows/msvc-cl/bazel_3.7.2/config/BUILD
@@ -28,7 +28,7 @@ toolchain(
         "@bazel_tools//platforms:windows",
         "@bazel_tools//platforms:x86_64",
     ],
-    toolchain = "//toolchains/configs/windows/msvc-cl/bazel_3.7.0/cc:cc-compiler-x64_windows",
+    toolchain = "//toolchains/configs/windows/msvc-cl/bazel_3.7.2/cc:cc-compiler-x64_windows",
     toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
 )
 

diff --git a/toolchains/configs/windows/versions.bzl b/toolchains/configs/windows/versions.bzl
@@ -4,7 +4,7 @@
 toolchain_config_spec0 = struct(config_repos = [], create_cc_configs = True, create_java_configs = False, env = {}, java_home = None, name = "msvc-cl")
 toolchain_config_spec1 = struct(config_repos = [], create_cc_configs = True, create_java_configs = False, env = {"USE_CLANG_CL": "1"}, java_home = None, name = "clang-cl")
 _TOOLCHAIN_CONFIG_SPECS = [toolchain_config_spec0,toolchain_config_spec1]
-_BAZEL_TO_CONFIG_SPEC_NAMES = {"3.6.0": ["msvc-cl", "clang-cl"], "3.7.0": ["msvc-cl", "clang-cl"]}
+_BAZEL_TO_CONFIG_SPEC_NAMES = {"3.6.0": ["msvc-cl", "clang-cl"], "3.7.2": ["msvc-cl", "clang-cl"]}
 LATEST = "sha256:664105e40acd48d9c9adec2e89d0ed30b52d790f2f712b3fd836efe61606ea56"
 CONTAINER_TO_CONFIG_SPEC_NAMES = {"sha256:664105e40acd48d9c9adec2e89d0ed30b52d790f2f712b3fd836efe61606ea56": ["msvc-cl", "clang-cl"]}
 _DEFAULT_TOOLCHAIN_CONFIG_SPEC = toolchain_config_spec0