diff options
| author | Josef Angstenberger <code@jtxa.de> | 2021-05-24 22:56:16 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-25 10:10:42 -0400 |
| commit | 74a2a7a4779636e814e28da41a6e164bfbc3d266 (patch) | |
| tree | 622b44b042ceb24ff127832b7e970ade1cdb809a | |
| parent | c3b9d9b756c84961208ad3086f5f123828fc5400 (diff) | |
| download | cmake-74a2a7a4779636e814e28da41a6e164bfbc3d266.tar.gz | |
Compiler/TI: Restore response file usage for linker
The commit 98fea8205e (Compiler/TI: Avoid response file usage for
linker, 2020-07-11, v3.19.0-rc1~495^2) disabled linker file usage by
default. The previous settings were working, even if not for all cases.
Restore them and add an explanation in a comment.
Issue: #22233
| -rw-r--r-- | Modules/Compiler/TI.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Modules/Compiler/TI.cmake b/Modules/Compiler/TI.cmake index c8c1635134..0f9ded3ca4 100644 --- a/Modules/Compiler/TI.cmake +++ b/Modules/Compiler/TI.cmake @@ -16,6 +16,10 @@ set(__COMPILER_TI_SOURCE_FLAG_ASM "--asm_file") macro(__compiler_ti lang) set(CMAKE_${lang}_RESPONSE_FILE_FLAG "--cmd_file=") + # Using --cmd_file flag is not possible after the --run_linker flag. + # By using a whitespace only the filename is used without flag. + # That file is interpreted as linker command file which may contain files to link. + set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG " ") set(CMAKE_INCLUDE_FLAG_${lang} "--include_path=") set(CMAKE_DEPFILE_FLAGS_${lang} "--preproc_with_compile --preproc_dependency=<DEP_FILE>") @@ -29,11 +33,6 @@ macro(__compiler_ti lang) set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> qa <TARGET> <OBJECTS>") set(CMAKE_${lang}_ARCHIVE_FINISH "") - # After the --run_linker flag a response file is not possible - set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "") - set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_LIBRARIES 0) - set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 0) - set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_${lang}_COMPILER> <FLAGS> --run_linker --output_file=<TARGET> --map_file=<TARGET_NAME>.map <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES>") endmacro() |