Skip to content

Commit

Permalink
Regenerate windows toolchains from e5a3aeb
Browse files Browse the repository at this point in the history 
[skip ci]
images: Update llvm -> 16.0.0 (#315)

Signed-off-by: Ryan Northey <ryan@synca.io>
  • Loading branch information
@update-envoy
update-envoy[bot] committed Mar 11, 2024
1 parent f39c21b commit 98d2f92
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions toolchains/configs/windows/clang-cl/cc/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,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.29.30133\\bin\\HostX64\\x64;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\VC\\VCPackages;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\MSBuild\\Current\\bin\\Roslyn;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.22000.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.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\cppwinrt",
msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\um\\x64;C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\lib\\windows",
msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\um\\x64;C:\\Program Files\\LLVM\\lib\\clang\\16.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.29.30133/bin/HostX64/x64/ml64.exe",
msvc_link_path = "C:/Program Files/LLVM/bin/lld-link.exe",
Expand All @@ -220,7 +220,7 @@ cc_toolchain_config(
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\um",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\winrt",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\cppwinrt",
"C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\include"],
"C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\include"],
tool_paths = {
"ar": "C:/Program Files/LLVM/bin/llvm-lib.exe",
"ml": "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/ml64.exe",
Expand Down Expand Up @@ -478,8 +478,8 @@ cc_toolchain_config(
toolchain_identifier = "clang_cl_x64",
msvc_env_tmp = "C:\\Windows\\Temp",
msvc_env_path = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x64;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\VC\\VCPackages;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\MSBuild\\Current\\bin\\Roslyn;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.22000.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.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\cppwinrt;C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\include",
msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\um\\x64;C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\lib\\windows;C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\lib\\windows",
msvc_env_include = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\cppwinrt;C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\include",
msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\um\\x64;C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\lib\\windows;C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\lib\\windows",
msvc_cl_path = "C:/Program Files/LLVM/bin/clang-cl.exe",
msvc_ml_path = "C:/Program Files/LLVM/bin/clang-cl.exe",
msvc_link_path = "C:/Program Files/LLVM/bin/lld-link.exe",
Expand All @@ -490,8 +490,8 @@ cc_toolchain_config(
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\um",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\winrt",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\cppwinrt",
"C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\include",
"C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\include"],
"C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\include",
"C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\include"],
tool_paths = {
"ar": "C:/Program Files/LLVM/bin/llvm-lib.exe",
"ml": "C:/Program Files/LLVM/bin/clang-cl.exe",
Expand Down
2 changes: 1 addition & 1 deletion toolchains/configs/windows/clang-cl/config/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ platform(
"@platforms//cpu:x86_64",
],
exec_properties = {
"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:220eb4951f50c40d5e5495e04e36b5bbfeb70f8c95fe682429b141db4eb54164",
"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:26b8f70cc1ea17551b83035ce13cc7db78673b8d4ecdb9ad020631e0be3aa55a",
"OSFamily": "Windows",
},
)
6 changes: 3 additions & 3 deletions toolchains/configs/windows/msvc-cl/cc/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@ cc_toolchain_config(
toolchain_identifier = "clang_cl_x64",
msvc_env_tmp = "C:\\Windows\\Temp",
msvc_env_path = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x64;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\VC\\VCPackages;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\MSBuild\\Current\\bin\\Roslyn;C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.22000.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.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\cppwinrt;C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\include",
msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\um\\x64;C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\lib\\windows",
msvc_env_include = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\cppwinrt;C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\include",
msvc_env_lib = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.22000.0\\um\\x64;C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\lib\\windows",
msvc_cl_path = "C:/Program Files/LLVM/bin/clang-cl.exe",
msvc_ml_path = "C:/Program Files/LLVM/bin/clang-cl.exe",
msvc_link_path = "C:/Program Files/LLVM/bin/lld-link.exe",
Expand All @@ -489,7 +489,7 @@ cc_toolchain_config(
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\um",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\winrt",
"C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.22000.0\\cppwinrt",
"C:\\Program Files\\LLVM\\lib\\clang\\15.0.6\\include"],
"C:\\Program Files\\LLVM\\lib\\clang\\16.0.0\\include"],
tool_paths = {
"ar": "C:/Program Files/LLVM/bin/llvm-lib.exe",
"ml": "C:/Program Files/LLVM/bin/clang-cl.exe",
Expand Down
2 changes: 1 addition & 1 deletion toolchains/configs/windows/msvc-cl/config/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ platform(
"@platforms//cpu:x86_64",
],
exec_properties = {
"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:220eb4951f50c40d5e5495e04e36b5bbfeb70f8c95fe682429b141db4eb54164",
"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:26b8f70cc1ea17551b83035ce13cc7db78673b8d4ecdb9ad020631e0be3aa55a",
"OSFamily": "Windows",
},
)

0 comments on commit 98d2f92

Please sign in to comment.