From 74a2a7a4779636e814e28da41a6e164bfbc3d266 Mon Sep 17 00:00:00 2001 From: Josef Angstenberger Date: Mon, 24 May 2021 22:56:16 +0200 Subject: 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 --- Modules/Compiler/TI.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Modules/Compiler/TI.cmake b/Modules/Compiler/TI.cmake index c8c1635..0f9ded3 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=") @@ -29,11 +33,6 @@ macro(__compiler_ti lang) set(CMAKE_${lang}_ARCHIVE_APPEND " qa ") 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 " --run_linker --output_file= --map_file=.map ") endmacro() -- cgit v0.12