diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-12 08:00:44 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-12 08:00:44 -0500 |
| commit | e2303b257c0453033571ec20a767e9ab22308e8b (patch) | |
| tree | 1da39e4183fa44cc72b4ef52347f4e37115d3f27 | |
| parent | 3efc6ad2a2210b943e6307766c9a107eddd96540 (diff) | |
| parent | e4707048c01b28858237a21e614da56a696e9771 (diff) | |
| download | cmake-e2303b257c0453033571ec20a767e9ab22308e8b.tar.gz | |
Merge branch 'fix-iar-binutils-for-cxx' into release-3.10
Merge-request: !1572
| -rw-r--r-- | Modules/Compiler/IAR-FindBinUtils.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/IAR-FindBinUtils.cmake b/Modules/Compiler/IAR-FindBinUtils.cmake index 2b0479507b..d662f56151 100644 --- a/Modules/Compiler/IAR-FindBinUtils.cmake +++ b/Modules/Compiler/IAR-FindBinUtils.cmake @@ -10,7 +10,7 @@ get_filename_component(__iar_hint_2 "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPI set(__iar_hints "${__iar_hint_1}" "${__iar_hint_2}") -if("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") +if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") # could allow using normal binutils ar, since objects are normal ELF files? find_program(CMAKE_IAR_LINKARM ilinkarm.exe HINTS ${__iar_hints} DOC "The IAR ARM linker") @@ -38,7 +38,7 @@ set(CMAKE_IAR_LINKARM \"${CMAKE_IAR_LINKARM}\") ") -elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR") +elseif("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR") # For AVR and AVR32, IAR uses the "xlink" linker and the "xar" archiver: find_program(CMAKE_IAR_LINKER xlink.exe HINTS ${__iar_hints} |