summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileLibraryTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-06-17 23:32:30 (GMT)
committerBrad King <brad.king@kitware.com>2006-06-17 23:32:30 (GMT)
commit7d550e8dc0423b9d8c9ee6c25cbeaa5f118e5c69 (patch)
treeca3eaaf5ba53c2fc1680fdb2729cc6ade9d9640d /Source/cmMakefileLibraryTargetGenerator.cxx
parentda1407942ae2633b4b3ca14a54e45bd38131d70b (diff)
downloadCMake-7d550e8dc0423b9d8c9ee6c25cbeaa5f118e5c69.zip
CMake-7d550e8dc0423b9d8c9ee6c25cbeaa5f118e5c69.tar.gz
CMake-7d550e8dc0423b9d8c9ee6c25cbeaa5f118e5c69.tar.bz2
BUG: Need to use different link script name when relinking.
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileLibraryTargetGenerator.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index c2de260..537f138 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -389,7 +389,14 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
{
useLinkScript = true;
linkScriptName = this->TargetBuildDirectoryFull;
- linkScriptName += "/link.txt";
+ if(relink)
+ {
+ linkScriptName += "/relink.txt";
+ }
+ else
+ {
+ linkScriptName += "/link.txt";
+ }
std::auto_ptr<cmGeneratedFileStream> lss(
new cmGeneratedFileStream(linkScriptName.c_str()));
linkScriptStream = lss;