diff options
| author | Thomas Bernard <tbernard@go-engineering.de> | 2020-07-28 17:48:47 (GMT) |
|---|---|---|
| committer | Thomas Bernard <tbernard@go-engineering.de> | 2020-07-28 17:48:47 (GMT) |
| commit | 270e0d9c4d47821b884b87b4f69129d7f2b80677 (patch) | |
| tree | 08f100774701c9a523292aa16606e6dfbbe5da0b /Modules | |
| parent | e4e899056eca97e62d40d47bf4ee2a4871553751 (diff) | |
| download | CMake-270e0d9c4d47821b884b87b4f69129d7f2b80677.zip CMake-270e0d9c4d47821b884b87b4f69129d7f2b80677.tar.gz CMake-270e0d9c4d47821b884b87b4f69129d7f2b80677.tar.bz2 | |
Detect the correct target architecture for clang compilers.
During compiler identification, if CMAKE_{C,CXX}_COMPILER_TARGET is
defined, the corresponding clang target flag is used to guaranty proper
target architecture detection.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCCompiler.cmake | 4 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index 86683d1..1311719 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -87,7 +87,9 @@ else() "--target=arm-arm-none-eabi -mcpu=cortex-m3" ) endif() - +if(CMAKE_C_COMPILER_TARGET) + list(PREPEND CMAKE_C_COMPILER_ID_TEST_FLAGS "-c --target=${CMAKE_C_COMPILER_TARGET}") +endif() # Build a small source file to identify the compiler. if(NOT CMAKE_C_COMPILER_ID_RUN) set(CMAKE_C_COMPILER_ID_RUN 1) diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index 662b831..46f1ee1 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -83,6 +83,10 @@ else() ) endif() +if(CMAKE_CXX_COMPILER_TARGET) + list(PREPEND CMAKE_CXX_COPMILER_ID_TEST_FLAGS "-c --target=${CMAKE_CXX_COMPILER_TARGET}") +endif() + # Build a small source file to identify the compiler. if(NOT CMAKE_CXX_COMPILER_ID_RUN) set(CMAKE_CXX_COMPILER_ID_RUN 1) diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 2476a33..e272da9 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -356,6 +356,11 @@ macro(__windows_compiler_msvc lang) set(_CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE YES) set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES) + if(CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.4.0) + set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "-target ") + else() + set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "--target=") + endif() # '-flto=thin' available since Clang 3.9 and Xcode 8 # * http://clang.llvm.org/docs/ThinLTO.html#clang-llvm # * https://trac.macports.org/wiki/XcodeVersionInfo |