Skip to content

Commit

Permalink
Regenerate windows toolchains from 7404aae
Browse files Browse the repository at this point in the history
  [skip ci]
  Regenerate linux toolchains from 14c1072

  [skip ci]
  update bazel to 3.4.1 (#85)

Note that Bazel's toolchain for 3.4.1 is tagged 3.4.0: https://github.com/bazelbuild/bazel-toolchains/releases/tag/3.4.0

Unblocking envoyproxy/envoy#12123

Signed-off-by: Michael Rebello <me@michaelrebello.com>
  • Loading branch information
envoy-build-tools(Azure Pipelines) committed Jul 18, 2020
1 parent 7404aae commit 1d6573e
Show file tree
Hide file tree
Showing 14 changed files with 1,893 additions and 12 deletions.
14 changes: 7 additions & 7 deletions toolchains/configs/windows/.latest.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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/msvc-cl/bazel_3.3.1/java:jdk
build:remote --javabase=//toolchains/configs/windows/msvc-cl/bazel_3.3.1/java:jdk
build:remote --crosstool_top=//toolchains/configs/windows/msvc-cl/bazel_3.3.1/cc:toolchain
build:remote --extra_toolchains=//toolchains/configs/windows/msvc-cl/bazel_3.3.1/config:cc-toolchain
build:remote --extra_execution_platforms=//toolchains/configs/windows/msvc-cl/bazel_3.3.1/config:platform
build:remote --host_platform=//toolchains/configs/windows/msvc-cl/bazel_3.3.1/config:platform
build:remote --platforms=//toolchains/configs/windows/msvc-cl/bazel_3.3.1/config:platform
build:remote --host_javabase=//toolchains/configs/windows/msvc-cl/bazel_3.4.1/java:jdk
build:remote --javabase=//toolchains/configs/windows/msvc-cl/bazel_3.4.1/java:jdk
build:remote --crosstool_top=//toolchains/configs/windows/msvc-cl/bazel_3.4.1/cc:toolchain
build:remote --extra_toolchains=//toolchains/configs/windows/msvc-cl/bazel_3.4.1/config:cc-toolchain
build:remote --extra_execution_platforms=//toolchains/configs/windows/msvc-cl/bazel_3.4.1/config:platform
build:remote --host_platform=//toolchains/configs/windows/msvc-cl/bazel_3.4.1/config:platform
build:remote --platforms=//toolchains/configs/windows/msvc-cl/bazel_3.4.1/config:platform

# Import the default bazelrc file in bazel-toolchains repo.
# This will only work for tests executed from bazel-toolchains
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ platform(
"@bazel_tools//platforms:windows",
"@bazel_tools//platforms:x86_64",
],
exec_properties = {"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:cab0ab04cc1835b984da58a295ef229b8ce7f1e1b60599684bdf3a85ca15665f", "OSFamily": "Windows"},
exec_properties = {"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:8873581d1aa3bec7acb0c0c5a9f6f45928e151c8e77f10d19843722bdf4ba281", "OSFamily": "Windows"},
)
338 changes: 338 additions & 0 deletions toolchains/configs/windows/msvc-cl/bazel_3.4.1/cc/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,338 @@
# Copyright 2018 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# This becomes the BUILD file for @local_config_cc// under Windows.

package(default_visibility = ["//visibility:public"])

load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite", "cc_library")
load(":windows_cc_toolchain_config.bzl", "cc_toolchain_config")
load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
cc_library(
name = "malloc",
)

filegroup(
name = "empty",
srcs = [],
)

filegroup(
name = "mingw_compiler_files",
srcs = [":builtin_include_directory_paths_mingw"]
)

filegroup(
name = "clangcl_compiler_files",
srcs = [":builtin_include_directory_paths_clangcl"]
)

filegroup(
name = "msvc_compiler_files",
srcs = [":builtin_include_directory_paths_msvc"]
)

# Hardcoded toolchain, legacy behaviour.
cc_toolchain_suite(
name = "toolchain",
toolchains = {
"armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
"x64_windows|msvc-cl": ":cc-compiler-x64_windows",
"x64_windows|msys-gcc": ":cc-compiler-x64_windows_msys",
"x64_windows|mingw-gcc": ":cc-compiler-x64_windows_mingw",
"x64_windows|clang-cl": ":cc-compiler-x64_windows-clang-cl",
"x64_windows_msys": ":cc-compiler-x64_windows_msys",
"x64_windows": ":cc-compiler-x64_windows",
"armeabi-v7a": ":cc-compiler-armeabi-v7a",
},
)

cc_toolchain(
name = "cc-compiler-x64_windows_msys",
toolchain_identifier = "msys_x64",
toolchain_config = ":msys_x64",
all_files = ":empty",
ar_files = ":empty",
as_files = ":mingw_compiler_files",
compiler_files = ":mingw_compiler_files",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
strip_files = ":empty",
supports_param_files = 1,
)

cc_toolchain_config(
name = "msys_x64",
cpu = "x64_windows",
compiler = "msys-gcc",
host_system_name = "local",
target_system_name = "local",
target_libc = "msys",
abi_version = "local",
abi_libc_version = "local",
cxx_builtin_include_directories = [ "c:/tools/msys64/usr/",
],
tool_paths = {"ar": "c:/tools/msys64/usr/bin/ar",
"compat-ld": "c:/tools/msys64/usr/bin/compat-ld",
"cpp": "c:/tools/msys64/usr/bin/cpp",
"dwp": "c:/tools/msys64/usr/bin/dwp",
"gcc": "c:/tools/msys64/usr/bin/gcc",
"gcov": "c:/tools/msys64/usr/bin/gcov",
"ld": "c:/tools/msys64/usr/bin/ld",
"nm": "c:/tools/msys64/usr/bin/nm",
"objcopy": "c:/tools/msys64/usr/bin/objcopy",
"objdump": "c:/tools/msys64/usr/bin/objdump",
"strip": "c:/tools/msys64/usr/bin/strip"},
tool_bin_path = "c:/tools/msys64/usr/bin",
dbg_mode_debug_flag = "/DEBUG:FULL",
fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
)

toolchain(
name = "cc-toolchain-x64_windows_msys",
exec_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
"@bazel_tools//tools/cpp:msys",
],
target_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
toolchain = ":cc-compiler-x64_windows_msys",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)

cc_toolchain(
name = "cc-compiler-x64_windows_mingw",
toolchain_identifier = "msys_x64_mingw",
toolchain_config = ":msys_x64_mingw",
all_files = ":empty",
ar_files = ":empty",
as_files = ":mingw_compiler_files",
compiler_files = ":mingw_compiler_files",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
strip_files = ":empty",
supports_param_files = 0,
)

cc_toolchain_config(
name = "msys_x64_mingw",
cpu = "x64_windows",
compiler = "mingw-gcc",
host_system_name = "local",
target_system_name = "local",
target_libc = "mingw",
abi_version = "local",
abi_libc_version = "local",
tool_bin_path = "c:/tools/msys64/mingw64/bin",
cxx_builtin_include_directories = [ "c:/tools/msys64/mingw64/",
],
tool_paths = {"ar": "c:/tools/msys64/mingw64/bin/ar",
"compat-ld": "c:/tools/msys64/mingw64/bin/compat-ld",
"cpp": "c:/tools/msys64/mingw64/bin/cpp",
"dwp": "c:/tools/msys64/mingw64/bin/dwp",
"gcc": "c:/tools/msys64/mingw64/bin/gcc",
"gcov": "c:/tools/msys64/mingw64/bin/gcov",
"ld": "c:/tools/msys64/mingw64/bin/ld",
"nm": "c:/tools/msys64/mingw64/bin/nm",
"objcopy": "c:/tools/msys64/mingw64/bin/objcopy",
"objdump": "c:/tools/msys64/mingw64/bin/objdump",
"strip": "c:/tools/msys64/mingw64/bin/strip"},
dbg_mode_debug_flag = "/DEBUG:FULL",
fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
)

toolchain(
name = "cc-toolchain-x64_windows_mingw",
exec_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
"@bazel_tools//tools/cpp:mingw",
],
target_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
toolchain = ":cc-compiler-x64_windows_mingw",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)

cc_toolchain(
name = "cc-compiler-x64_windows",
toolchain_identifier = "msvc_x64",
toolchain_config = ":msvc_x64",
all_files = ":empty",
ar_files = ":empty",
as_files = ":msvc_compiler_files",
compiler_files = ":msvc_compiler_files",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
strip_files = ":empty",
supports_param_files = 1,
)

cc_toolchain_config(
name = "msvc_x64",
cpu = "x64_windows",
compiler = "msvc-cl",
host_system_name = "local",
target_system_name = "local",
target_libc = "msvcrt",
abi_version = "local",
abi_libc_version = "local",
toolchain_identifier = "msvc_x64",
msvc_env_tmp = "C:\\Windows\\Temp",
msvc_env_path = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.26.28801\\bin\\HostX64\\x64;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\MSBuild\\Current\\bin\\Roslyn;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.18362.0\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\\\MSBuild\\Current\\Bin;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\Tools\\;;C:\\Windows\\system32",
msvc_env_include = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.26.28801\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\cppwinrt",
msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.26.28801\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.18362.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.18362.0\\um\\x64;",
msvc_cl_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/cl.exe",
msvc_ml_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/ml64.exe",
msvc_link_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/link.exe",
msvc_lib_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/lib.exe",
cxx_builtin_include_directories = [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.26.28801\\include",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\ucrt",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\shared",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\um",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\winrt",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\cppwinrt"],
tool_paths = {
"ar": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/lib.exe",
"ml": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/ml64.exe",
"cpp": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/cl.exe",
"gcc": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/cl.exe",
"gcov": "wrapper/bin/msvc_nop.bat",
"ld": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.26.28801/bin/HostX64/x64/link.exe",
"nm": "wrapper/bin/msvc_nop.bat",
"objcopy": "wrapper/bin/msvc_nop.bat",
"objdump": "wrapper/bin/msvc_nop.bat",
"strip": "wrapper/bin/msvc_nop.bat",
},
default_link_flags = ["/MACHINE:X64"],
dbg_mode_debug_flag = "/DEBUG:FULL",
fastbuild_mode_debug_flag = "/DEBUG:FASTLINK",
)

toolchain(
name = "cc-toolchain-x64_windows",
exec_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
target_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
toolchain = ":cc-compiler-x64_windows",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)

cc_toolchain(
name = "cc-compiler-x64_windows-clang-cl",
toolchain_identifier = "clang_cl_x64",
toolchain_config = ":clang_cl_x64",
all_files = ":empty",
ar_files = ":empty",
as_files = ":clangcl_compiler_files",
compiler_files = ":clangcl_compiler_files",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
strip_files = ":empty",
supports_param_files = 1,
)

cc_toolchain_config(
name = "clang_cl_x64",
cpu = "x64_windows",
compiler = "clang-cl",
host_system_name = "local",
target_system_name = "local",
target_libc = "msvcrt",
abi_version = "local",
abi_libc_version = "local",
toolchain_identifier = "clang_cl_x64",
msvc_env_tmp = "clang_cl_not_found",
msvc_env_path = "clang_cl_not_found",
msvc_env_include = "clang_cl_not_found",
msvc_env_lib = "clang_cl_not_found",
msvc_cl_path = "clang_installation_error.bat",
msvc_ml_path = "clang_installation_error.bat",
msvc_link_path = "clang_installation_error.bat",
msvc_lib_path = "clang_installation_error.bat",
cxx_builtin_include_directories = [],
tool_paths = {
"ar": "clang_installation_error.bat",
"ml": "clang_installation_error.bat",
"cpp": "clang_installation_error.bat",
"gcc": "clang_installation_error.bat",
"gcov": "wrapper/bin/msvc_nop.bat",
"ld": "clang_installation_error.bat",
"nm": "wrapper/bin/msvc_nop.bat",
"objcopy": "wrapper/bin/msvc_nop.bat",
"objdump": "wrapper/bin/msvc_nop.bat",
"strip": "wrapper/bin/msvc_nop.bat",
},
default_link_flags = ["/MACHINE:X64", "/DEFAULTLIB:clang_rt.builtins-x86_64.lib"],
dbg_mode_debug_flag = "/DEBUG",
fastbuild_mode_debug_flag = "/DEBUG",
)

toolchain(
name = "cc-toolchain-x64_windows-clang-cl",
exec_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
"@bazel_tools//tools/cpp:clang-cl",
],
target_compatible_with = [
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
toolchain = ":cc-compiler-x64_windows-clang-cl",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)

cc_toolchain(
name = "cc-compiler-armeabi-v7a",
toolchain_identifier = "stub_armeabi-v7a",
toolchain_config = ":stub_armeabi-v7a",
all_files = ":empty",
ar_files = ":empty",
as_files = ":empty",
compiler_files = ":empty",
dwp_files = ":empty",
linker_files = ":empty",
objcopy_files = ":empty",
strip_files = ":empty",
supports_param_files = 1,
)

armeabi_cc_toolchain_config(name = "stub_armeabi-v7a")

toolchain(
name = "cc-toolchain-armeabi-v7a",
exec_compatible_with = [
],
target_compatible_with = [
"@platforms//cpu:arm",
"@platforms//os:android",
],
toolchain = ":cc-compiler-armeabi-v7a",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)

0 comments on commit 1d6573e

Please sign in to comment.