diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-30 13:31:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-30 13:31:50 (GMT) |
| commit | 128a0c36eca74f6faab25342b76266f20c2b10e4 (patch) | |
| tree | 93b5039072d22ef4a2c27f392b86906123f7f2d8 /Source | |
| parent | 82a1b4fe513ea23c30ec107a1c86bc274de385d9 (diff) | |
| parent | 250ad08a085f54c1445369cdf3bf278613c6c0e5 (diff) | |
| download | CMake-128a0c36eca74f6faab25342b76266f20c2b10e4.zip CMake-128a0c36eca74f6faab25342b76266f20c2b10e4.tar.gz CMake-128a0c36eca74f6faab25342b76266f20c2b10e4.tar.bz2 | |
Merge topic 'remove-link-remnants'
250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 15a1b32..e344df4 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -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 = ""; } |