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/cmLocalGenerator.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/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 493d26e..244c9e5 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -50,6 +50,7 @@ cmLocalGenerator::cmLocalGenerator() this->MinGWMake = false; this->NMake = false; this->MSYSShell = false; + this->LinkScriptShell = false; this->IgnoreLibPrefix = false; this->UseRelativePaths = false; this->Configured = false; @@ -1995,7 +1996,7 @@ std::string cmLocalGenerator::Convert(const char* source, // For the MSYS shell convert drive letters to posix paths, so // that c:/some/path becomes /c/some/path. This is needed to // avoid problems with the shell path translation. - if(this->MSYSShell) + if(this->MSYSShell && !this->LinkScriptShell) { if(result.size() > 2 && result[1] == ':') { |