diff options
| author | Erwin Jansen <jansene@google.com> | 2021-06-30 07:29:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-30 07:29:26 +0000 |
| commit | 059cdc5996938f5f6b5343b6c969c12098275587 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /third_party/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake | |
| parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
| parent | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (diff) | |
| download | webrtc-emu-31-release.tar.gz | |
Merge "Merge upstream-master and enable ARM64" into emu-master-devemu-31-stable-releaseemu-31-release
Diffstat (limited to 'third_party/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake')
| -rw-r--r-- | third_party/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/third_party/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake b/third_party/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake index 9cd6fd1b2a..942ce90a4d 100644 --- a/third_party/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake +++ b/third_party/abseil-cpp/absl/copts/AbseilConfigureCopts.cmake @@ -35,8 +35,7 @@ endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(ABSL_DEFAULT_COPTS "${ABSL_GCC_FLAGS}") set(ABSL_TEST_COPTS "${ABSL_GCC_FLAGS};${ABSL_GCC_TEST_FLAGS}") -elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - # MATCHES so we get both Clang and AppleClang +elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") # MATCHES so we get both Clang and AppleClang if(MSVC) # clang-cl is half MSVC, half LLVM set(ABSL_DEFAULT_COPTS "${ABSL_CLANG_CL_FLAGS}") |