From c18db3903b9f0abd80ae740fde94f7e32aa40b92 Mon Sep 17 00:00:00 2001 From: James Sharpe Date: Tue, 29 Nov 2022 23:22:00 +0000 Subject: [PATCH] Fix Windows clang CI for CC toolchain resolution Select the correct toolchain and platform for building with clang on windows with CC toolchain resolution active. --- .bazelci/presubmit.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index f4ef9ee..04a5385 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -47,13 +47,15 @@ tasks: environment: BAZEL_VC: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC" build_flags: - - "--noincompatible_enable_cc_toolchain_resolution" + - "--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl" + - "--extra_execution_platforms=//:x64_windows-clang-cl" - "--compiler=clang-cl" - "--features=layering_check" build_targets: - "//..." test_flags: - - "--noincompatible_enable_cc_toolchain_resolution" + - "--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl" + - "--extra_execution_platforms=//:x64_windows-clang-cl" - "--compiler=clang-cl" - "--features=layering_check" test_targets: