diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-03 16:43:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-03 16:50:10 (GMT) |
| commit | f28e7fc1a51d5dfa81e2844c51eb811835e99583 (patch) | |
| tree | f0d2b72bd527c6b0d783f1a7fed17cb5d7ecc91d | |
| parent | 3c9dec0bdc11a69afcbaa93a0e61dc71cddd5491 (diff) | |
| download | CMake-f28e7fc1a51d5dfa81e2844c51eb811835e99583.zip CMake-f28e7fc1a51d5dfa81e2844c51eb811835e99583.tar.gz CMake-f28e7fc1a51d5dfa81e2844c51eb811835e99583.tar.bz2 | |
ARMCC: Do not identify ARMClang as ARMCC
Since commit 8f8d056051 (ARMCC: Fix identification of ARM compiler when
it defines GNU macros, 2019-03-20, v3.14.1~10^2) we consider ARMCC
before Clang or GNU compilers. Since armclang also defines
`__ARMCC_VERSION` it is now mistaken for ARMCC. Extend the check for
ARMCC to also verify that `__clang__` is not defined.
Issue: #19065
| -rw-r--r-- | Modules/Compiler/ARMCC-DetermineCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/ARMCC-DetermineCompiler.cmake b/Modules/Compiler/ARMCC-DetermineCompiler.cmake index a3667d7..5f2d0f8 100644 --- a/Modules/Compiler/ARMCC-DetermineCompiler.cmake +++ b/Modules/Compiler/ARMCC-DetermineCompiler.cmake @@ -1,5 +1,5 @@ # ARMCC Toolchain -set(_compiler_id_pp_test "defined(__ARMCC_VERSION)") +set(_compiler_id_pp_test "defined(__ARMCC_VERSION) && !defined(__clang__)") set(_compiler_id_version_compute " #if __ARMCC_VERSION >= 1000000 |