diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-08 10:21:38 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-10 18:38:59 (GMT) |
| commit | 77c4202edc242c96087295585a85a20700bdb26f (patch) | |
| tree | fd0c780e1e758ed43e5b2958cd467cca9ad78c7a /Source/cmMakefileExecutableTargetGenerator.cxx | |
| parent | 09b6cc66b09b9689ca01faee5e33ef101b46f972 (diff) | |
| download | CMake-77c4202edc242c96087295585a85a20700bdb26f.zip CMake-77c4202edc242c96087295585a85a20700bdb26f.tar.gz CMake-77c4202edc242c96087295585a85a20700bdb26f.tar.bz2 | |
cmLinkLineComputer: Move RPath computation from cmLocalGenerator
Add state for Relink and populate it at the point of cmLinkLineComputer
initialization. This allows removal of the parameter in go-between
methods.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index eaa5061..f17e012 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -310,10 +310,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) this->LocalGenerator->GetStateSnapshot().GetDirectory())); linkLineComputer->SetForResponse(useResponseFileForLibs); linkLineComputer->SetUseWatcomQuote(useWatcomQuote); + linkLineComputer->SetRelink(relink); // Collect up flags to link in needed libraries. std::string linkLibs; - this->CreateLinkLibs(linkLineComputer.get(), linkLibs, relink, + this->CreateLinkLibs(linkLineComputer.get(), linkLibs, useResponseFileForLibs, depends, useWatcomQuote); // Construct object file lists that may be needed to expand the |