summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Viola <geoffrey.viola@asirobots.com>2015-09-06 05:15:26 (GMT)
committerBrad King <brad.king@kitware.com>2015-09-09 14:14:54 (GMT)
commitfbe0de92f0cec56d12219125547edced7b3fd413 (patch)
treec1847966e3a0c5b3a232d55cf72c2a6eb6bca5c7
parent63591b94ab1be542f5fe5635d5f2068ddbe619e2 (diff)
downloadCMake-fbe0de92f0cec56d12219125547edced7b3fd413.zip
CMake-fbe0de92f0cec56d12219125547edced7b3fd413.tar.gz
CMake-fbe0de92f0cec56d12219125547edced7b3fd413.tar.bz2
GHS: Tell MULTI to delete .elf.ael file
-rw-r--r--Source/cmGhsMultiTargetGenerator.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 846b6e2..8216824 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -151,10 +151,6 @@ void cmGhsMultiTargetGenerator::Generate()
this->WriteTargetLinkLibraries();
}
this->WriteCustomCommands();
- if (this->DynamicDownload)
- {
- *this->GetFolderBuildStreams() << " " << this->DDOption << std::endl;
- }
this->WriteSources(objectSources);
}
@@ -230,9 +226,11 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
}
if (this->IsTargetGroup())
{
- *this->GetFolderBuildStreams() << " -non_shared" << std::endl;
- *this->GetFolderBuildStreams() << " -o \"" << outputDir
- << outputFilename << ".elf\""
+ *this->GetFolderBuildStreams()
+ << " {optgroup=GhsCommonOptions} -o \"" << outputDir
+ << outputFilename << ".elf\"" << std::endl;
+ *this->GetFolderBuildStreams() << " :extraOutputFile=\"" << outputDir
+ << outputFilename << ".elf.ael\""
<< std::endl;
}
else