diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-11 12:30:27 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-11 08:30:33 -0400 |
| commit | 5b5d2dc766349325a333ff05326f91e177d3ab75 (patch) | |
| tree | 962d1135b6d9d079bf8d96e0ee7c20ed6d9eed19 | |
| parent | 1db8c1dce232bf933e30c489f836c754ce8e5daa (diff) | |
| parent | 3d1ed986e23b13bd09625c4347cb65b48fc1df52 (diff) | |
| download | cmake-5b5d2dc766349325a333ff05326f91e177d3ab75.tar.gz | |
Merge topic 'armclang-fixes' into release-3.18
3d1ed986e2 ARMClang: Fix link line generation after addition of armlink support
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Osama Moharam <osama.moharam.uw@renesas.com>
Merge-request: !5211
| -rw-r--r-- | Modules/Compiler/ARMClang.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/Compiler/ARMClang.cmake b/Modules/Compiler/ARMClang.cmake index 01ce91d4a0..f100af8435 100644 --- a/Modules/Compiler/ARMClang.cmake +++ b/Modules/Compiler/ARMClang.cmake @@ -115,11 +115,12 @@ macro(__compiler_armclang lang) endif() if(__CMAKE_ARMClang_USING_armlink) + unset(CMAKE_${lang}_LINKER_WRAPPER_FLAG) set(__CMAKE_ARMClang_USING_armlink_WRAPPER "") else() - set(__CMAKE_ARMClang_USING_armlink_WRAPPER ${CMAKE_${lang}_LINKER_WRAPPER_FLAG}) + set(__CMAKE_ARMClang_USING_armlink_WRAPPER "-Xlinker") endif() - set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET> ${__CMAKE_ARMClang_USING_armlink_WRAPPER} --list <TARGET_BASE>.map") + set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS> -o <TARGET> ${__CMAKE_ARMClang_USING_armlink_WRAPPER} --list=<TARGET_BASE>.map") set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "<CMAKE_AR> --create -cr <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> --create -cr <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "${__CMAKE_ARMClang_USING_armlink_WRAPPER} --via=") |