From 2d13ad4157997715a4939bd218a89c81c26ff28e Mon Sep 17 00:00:00 2001 From: "envoy-build-tools(Azure Pipelines)" Date: Fri, 21 Aug 2020 19:15:37 +0000 Subject: [PATCH] Regenerate windows toolchains from 4e06e4d96356e49db5ea4204fa3009ac11391178 [skip ci] Set USE_CLANG_CL=1 to force substitute llvm tools (#88) It seems bazel-toolchains does not as of yet let us choose the actual compiler we are targeting so the cc-compiler-x64_windows always points to msvc-cl while on Linux, cc-compiler-k8 points to the correct compiler (gcc or clang etc.). With this change, we are in fact still using the compiler named msvc-cl but the toolchain config points to llvm tools rather than MSVC tools. The MSVC cl.exe and link.exe command syntax is what is common. We may be able to undo this if either Bazel itself is able to change its CC toolchain rules for Windows to match the better Linux pattern (and do away with the USE_CLANG_CL logic) or bazel-toolchains has a good way of specifying a target cpu and compiler (so we can for example specify x64_windows and clang-cl or x64_windows and msvc-cl to get the correct toolchain). Signed-off-by: Sunjay Bhatia Co-authored-by: William A Rowe Jr --- .../windows/clang-cl/bazel_3.3.1/cc/BUILD | 34 ++++++++++--------- .../builtin_include_directory_paths_clangcl | 1 + .../cc/builtin_include_directory_paths_msvc | 1 + .../windows/clang-cl/bazel_3.4.1/cc/BUILD | 34 ++++++++++--------- .../builtin_include_directory_paths_clangcl | 1 + .../cc/builtin_include_directory_paths_msvc | 1 + toolchains/configs/windows/versions.bzl | 2 +- 7 files changed, 41 insertions(+), 33 deletions(-) diff --git a/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/BUILD b/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/BUILD index b4685245..99bcce4c 100644 --- a/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/BUILD +++ b/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/BUILD @@ -96,8 +96,8 @@ cc_toolchain_config( "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", + dbg_mode_debug_flag = "/DEBUG", + fastbuild_mode_debug_flag = "/DEBUG", ) toolchain( @@ -153,8 +153,8 @@ cc_toolchain_config( "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", + dbg_mode_debug_flag = "/DEBUG", + fastbuild_mode_debug_flag = "/DEBUG", ) toolchain( @@ -200,32 +200,33 @@ cc_toolchain_config( msvc_env_tmp = "C:\\Windows\\Temp", msvc_env_path = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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.27.29110\\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.27.29110\\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.27.29110/bin/HostX64/x64/cl.exe", + msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\lib\\windows", + msvc_cl_path = "C:/Program Files/LLVM/bin/clang-cl.exe", msvc_ml_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/ml64.exe", - msvc_link_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/link.exe", - msvc_lib_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/lib.exe", + msvc_link_path = "C:/Program Files/LLVM/bin/lld-link.exe", + msvc_lib_path = "C:/Program Files/LLVM/bin/llvm-lib.exe", cxx_builtin_include_directories = [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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"], + "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\cppwinrt", + "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include"], tool_paths = { - "ar": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/lib.exe", + "ar": "C:/Program Files/LLVM/bin/llvm-lib.exe", "ml": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/ml64.exe", - "cpp": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/cl.exe", - "gcc": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/cl.exe", + "cpp": "C:/Program Files/LLVM/bin/clang-cl.exe", + "gcc": "C:/Program Files/LLVM/bin/clang-cl.exe", "gcov": "wrapper/bin/msvc_nop.bat", - "ld": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/link.exe", + "ld": "C:/Program Files/LLVM/bin/lld-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", + dbg_mode_debug_flag = "/DEBUG", + fastbuild_mode_debug_flag = "/DEBUG", ) toolchain( @@ -270,7 +271,7 @@ cc_toolchain_config( msvc_env_tmp = "C:\\Windows\\Temp", msvc_env_path = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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.27.29110\\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;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include", - msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\lib\\windows", + msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\lib\\windows;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\lib\\windows", msvc_cl_path = "C:/Program Files/LLVM/bin/clang-cl.exe", msvc_ml_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/ml64.exe", msvc_link_path = "C:/Program Files/LLVM/bin/lld-link.exe", @@ -281,6 +282,7 @@ cc_toolchain_config( "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", + "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include", "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include"], tool_paths = { "ar": "C:/Program Files/LLVM/bin/llvm-lib.exe", diff --git a/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/builtin_include_directory_paths_clangcl b/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/builtin_include_directory_paths_clangcl index bd9fcfc1..1950c8a5 100644 --- a/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/builtin_include_directory_paths_clangcl +++ b/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/builtin_include_directory_paths_clangcl @@ -10,4 +10,5 @@ declared action inputs or the action commandline changes. "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", + "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include", "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include" diff --git a/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/builtin_include_directory_paths_msvc b/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/builtin_include_directory_paths_msvc index 9e9aa999..b4fec632 100644 --- a/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/builtin_include_directory_paths_msvc +++ b/toolchains/configs/windows/clang-cl/bazel_3.3.1/cc/builtin_include_directory_paths_msvc @@ -10,3 +10,4 @@ declared action inputs or the action commandline changes. "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" +"C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include" diff --git a/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/BUILD b/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/BUILD index b4685245..99bcce4c 100644 --- a/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/BUILD +++ b/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/BUILD @@ -96,8 +96,8 @@ cc_toolchain_config( "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", + dbg_mode_debug_flag = "/DEBUG", + fastbuild_mode_debug_flag = "/DEBUG", ) toolchain( @@ -153,8 +153,8 @@ cc_toolchain_config( "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", + dbg_mode_debug_flag = "/DEBUG", + fastbuild_mode_debug_flag = "/DEBUG", ) toolchain( @@ -200,32 +200,33 @@ cc_toolchain_config( msvc_env_tmp = "C:\\Windows\\Temp", msvc_env_path = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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.27.29110\\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.27.29110\\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.27.29110/bin/HostX64/x64/cl.exe", + msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\lib\\windows", + msvc_cl_path = "C:/Program Files/LLVM/bin/clang-cl.exe", msvc_ml_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/ml64.exe", - msvc_link_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/link.exe", - msvc_lib_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/lib.exe", + msvc_link_path = "C:/Program Files/LLVM/bin/lld-link.exe", + msvc_lib_path = "C:/Program Files/LLVM/bin/llvm-lib.exe", cxx_builtin_include_directories = [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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"], + "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.18362.0\\cppwinrt", + "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include"], tool_paths = { - "ar": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/lib.exe", + "ar": "C:/Program Files/LLVM/bin/llvm-lib.exe", "ml": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/ml64.exe", - "cpp": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/cl.exe", - "gcc": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/cl.exe", + "cpp": "C:/Program Files/LLVM/bin/clang-cl.exe", + "gcc": "C:/Program Files/LLVM/bin/clang-cl.exe", "gcov": "wrapper/bin/msvc_nop.bat", - "ld": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/link.exe", + "ld": "C:/Program Files/LLVM/bin/lld-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", + dbg_mode_debug_flag = "/DEBUG", + fastbuild_mode_debug_flag = "/DEBUG", ) toolchain( @@ -270,7 +271,7 @@ cc_toolchain_config( msvc_env_tmp = "C:\\Windows\\Temp", msvc_env_path = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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.27.29110\\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;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include", - msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\lib\\windows", + msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.27.29110\\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;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\lib\\windows;C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\lib\\windows", msvc_cl_path = "C:/Program Files/LLVM/bin/clang-cl.exe", msvc_ml_path = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/HostX64/x64/ml64.exe", msvc_link_path = "C:/Program Files/LLVM/bin/lld-link.exe", @@ -281,6 +282,7 @@ cc_toolchain_config( "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", + "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include", "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include"], tool_paths = { "ar": "C:/Program Files/LLVM/bin/llvm-lib.exe", diff --git a/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/builtin_include_directory_paths_clangcl b/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/builtin_include_directory_paths_clangcl index bd9fcfc1..1950c8a5 100644 --- a/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/builtin_include_directory_paths_clangcl +++ b/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/builtin_include_directory_paths_clangcl @@ -10,4 +10,5 @@ declared action inputs or the action commandline changes. "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", + "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include", "C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include" diff --git a/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/builtin_include_directory_paths_msvc b/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/builtin_include_directory_paths_msvc index 9e9aa999..b4fec632 100644 --- a/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/builtin_include_directory_paths_msvc +++ b/toolchains/configs/windows/clang-cl/bazel_3.4.1/cc/builtin_include_directory_paths_msvc @@ -10,3 +10,4 @@ declared action inputs or the action commandline changes. "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" +"C:\\Program Files\\LLVM\\lib\\clang\\10.0.0\\include" diff --git a/toolchains/configs/windows/versions.bzl b/toolchains/configs/windows/versions.bzl index 8de0d10b..eb967916 100644 --- a/toolchains/configs/windows/versions.bzl +++ b/toolchains/configs/windows/versions.bzl @@ -2,7 +2,7 @@ # Generated by 'rbe_windows_clang_cl_gen' rbe_autoconfig rule """Definitions to be used in rbe_repo attr of an rbe_autoconf rule """ 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 = {}, java_home = None, name = "clang-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.3.1": ["msvc-cl", "clang-cl"], "3.4.1": ["msvc-cl", "clang-cl"]} LATEST = "sha256:7edd9713c21d2ac4ac55433eb7dc6a4c57bb84e4daf817dff07ed8c3847b67d1"