diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2020-09-10 13:50:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-09-10 20:33:14 (GMT) |
| commit | 3d1ed986e23b13bd09625c4347cb65b48fc1df52 (patch) | |
| tree | a18ab02e4c3f65afbf65633857b044bd82d59fce /Modules | |
| parent | 06cb6a162872cdd45a51dfce718d63ecea8a2d03 (diff) | |
| download | CMake-3d1ed986e23b13bd09625c4347cb65b48fc1df52.zip CMake-3d1ed986e23b13bd09625c4347cb65b48fc1df52.tar.gz CMake-3d1ed986e23b13bd09625c4347cb65b48fc1df52.tar.bz2 | |
ARMClang: Fix link line generation after addition of armlink support
Revise logic added by commit 73fb6ac82b (ARMClang: Add support for
armlink, 2020-06-02, v3.18.0-rc1~27^2).
Fixes: #21154
Diffstat (limited to 'Modules')
| -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 01ce91d..f100af8 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=") |