Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-15 03:48:02 +08:00
Code Issues Projects Releases Wiki Activity

Compiler/TI: Restore response file usage for linker

Browse Source 
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
This commit is contained in:
Josef Angstenberger
2021-05-24 22:56:16 +02:00
committed by Brad King
parent c3b9d9b756
commit 74a2a7a477
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Compiler/TI.cmake
View File

@@ -16,6 +16,10 @@ set(__COMPILER_TI_SOURCE_FLAG_ASM "--asm_file")
macro(__compiler_ti lang) macro(__compiler_ti lang)
set(CMAKE_${lang}_RESPONSE_FILE_FLAG "--cmd_file=") 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_INCLUDE_FLAG_${lang} "--include_path=")
set(CMAKE_DEPFILE_FLAGS_${lang} "--preproc_with_compile --preproc_dependency=<DEP_FILE>") 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_APPEND "<CMAKE_AR> qa <TARGET> <OBJECTS>")
set(CMAKE_${lang}_ARCHIVE_FINISH "") 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>") 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() endmacro()