diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2021-04-08 10:23:55 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2021-04-08 10:23:55 -0400 |
| commit | feac56827dd1f0d159ea0bcf2ce37ef1990ac743 (patch) | |
| tree | bc8ca767be02a5b22118108f9712b72ec64064c3 /absl/copts/configure_copts.bzl | |
| parent | 2b91b17d526b464840a3f45504c594cdb50152c5 (diff) | |
| parent | 997aaf3a28308eba1b9156aa35ab7bca9688e9f6 (diff) | |
Merge new upstream LTS 20210324.0
Diffstat (limited to 'absl/copts/configure_copts.bzl')
| -rw-r--r-- | absl/copts/configure_copts.bzl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/absl/copts/configure_copts.bzl b/absl/copts/configure_copts.bzl index ff9a5ea9..669a9060 100644 --- a/absl/copts/configure_copts.bzl +++ b/absl/copts/configure_copts.bzl @@ -22,21 +22,21 @@ load( ) ABSL_DEFAULT_COPTS = select({ - "//absl:windows": ABSL_MSVC_FLAGS, - "//absl:llvm_compiler": ABSL_LLVM_FLAGS, + "//absl:msvc_compiler": ABSL_MSVC_FLAGS, + "//absl:clang-cl_compiler": ABSL_CLANG_CL_FLAGS, + "//absl:clang_compiler": ABSL_LLVM_FLAGS, "//conditions:default": ABSL_GCC_FLAGS, }) -# in absence of modules (--compiler=gcc or -c opt), cc_tests leak their copts -# to their (included header) dependencies and fail to build outside absl ABSL_TEST_COPTS = ABSL_DEFAULT_COPTS + select({ - "//absl:windows": ABSL_MSVC_TEST_FLAGS, - "//absl:llvm_compiler": ABSL_LLVM_TEST_FLAGS, + "//absl:msvc_compiler": ABSL_MSVC_TEST_FLAGS, + "//absl:clang-cl_compiler": ABSL_CLANG_CL_TEST_FLAGS, + "//absl:clang_compiler": ABSL_LLVM_TEST_FLAGS, "//conditions:default": ABSL_GCC_TEST_FLAGS, }) ABSL_DEFAULT_LINKOPTS = select({ - "//absl:windows": ABSL_MSVC_LINKOPTS, + "//absl:msvc_compiler": ABSL_MSVC_LINKOPTS, "//conditions:default": [], }) |