diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-30 02:16:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-30 02:16:49 (GMT) |
| commit | 52b3f85642bd54362ec84c7279e3d63047861a53 (patch) | |
| tree | 4df72032fa11b810afe9cd879017c34a1f1308fc /Source/cmMakefileExecutableTargetGenerator.cxx | |
| parent | 66e0b4212fbbaaf3c5aa5af6a51aa3a5af002edf (diff) | |
| download | CMake-52b3f85642bd54362ec84c7279e3d63047861a53.zip CMake-52b3f85642bd54362ec84c7279e3d63047861a53.tar.gz CMake-52b3f85642bd54362ec84c7279e3d63047861a53.tar.bz2 | |
ENH: Enable use of link script whenever incremental archive construction rules are available. Enable use of archive construction rules on MSYS.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index e67b991..bb54f26 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -367,6 +367,9 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) // Expand the rule variables. { + // Set path conversion for link script shells. + this->LocalGenerator->SetLinkScriptShell(useLinkScript); + // Collect up flags to link in needed libraries. cmOStringStream linklibs; this->LocalGenerator->OutputLinkLibraries(linklibs, *this->Target, relink); @@ -428,6 +431,9 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) this->LocalGenerator->ExpandRuleVariables(*i, vars); } this->LocalGenerator->TargetImplib = ""; + + // Restore path conversion to normal shells. + this->LocalGenerator->SetLinkScriptShell(false); } // Optionally convert the build rule to use a script to avoid long |