Merge topic 'remove-link-remnants'
250ad08a
Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
This commit is contained in:
commit
128a0c36ec
|
@ -26,7 +26,6 @@ set(CMAKE_Fortran_COMPILE_OBJECT
|
|||
|
||||
set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
|
||||
|
||||
set(CMAKE_${lang}_COMPILER_LINKER_OPTION_FLAG_EXECUTABLE "/link")
|
||||
set(CMAKE_Fortran_LINK_EXECUTABLE
|
||||
"<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /exe:<TARGET> <OBJECTS> /link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
|
||||
|
||||
|
|
|
@ -187,12 +187,7 @@ cmNinjaNormalTargetGenerator
|
|||
responseFlag += rspfile;
|
||||
|
||||
// build response file content
|
||||
std::string linkOptionVar = cmakeVarLang;
|
||||
linkOptionVar += "_COMPILER_LINKER_OPTION_FLAG_";
|
||||
linkOptionVar += cmTarget::GetTargetTypeName(targetType);
|
||||
const std::string linkOption =
|
||||
GetMakefile()->GetSafeDefinition(linkOptionVar);
|
||||
rspcontent = "$in_newline "+linkOption+" $LINK_PATH $LINK_LIBRARIES";
|
||||
rspcontent = "$in_newline $LINK_PATH $LINK_LIBRARIES";
|
||||
vars.Objects = responseFlag.c_str();
|
||||
vars.LinkLibraries = "";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue