From d153e294b8c44a1806fdfb523c4fe556ed537581 Mon Sep 17 00:00:00 2001 From: Rodrigo Queiro Date: Wed, 2 Mar 2022 16:50:36 +0100 Subject: [PATCH] Avoid "GLOG_EXPORT macro redefined" in clang-cl CI I would prefer to fix this in glog.bzl but couldn't get that to work. --- .bazelci/presubmit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index de80b11..eaf889f 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -51,7 +51,7 @@ tasks: - "--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl" - "--extra_execution_platforms=//:x64_windows-clang-cl" - "--features=layering_check" - - "--copt=/WX" + - "--copt=-Wno-macro-redefined" build_targets: - "//..." test_flags: @@ -59,6 +59,6 @@ tasks: - "--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl" - "--extra_execution_platforms=//:x64_windows-clang-cl" - "--features=layering_check" - - "--copt=/WX" + - "--copt=-Wno-macro-redefined" test_targets: - "//..."