kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ghs-drop-optgroup' 

ce7ccafc GHS: Remove extra flag to GHS MULTI compiler (#15771)
This commit is contained in:
Brad King 2015-10-16 09:35:41 -04:00 committed by CMake Topic Stage
parent 02f8d51f48 ce7ccafce2
commit 893ce307f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGhsMultiTargetGenerator.cxx
View File

@ -217,7 +217,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY) if (this->GeneratorTarget->GetType() == cmState::STATIC_LIBRARY)
{ {
*this->GetFolderBuildStreams() << " {optgroup=GhsCommonOptions} -o \"" *this->GetFolderBuildStreams() << " -o \""
<< outputDir << outputFilename << ".a\"" << outputDir << outputFilename << ".a\""
<< std::endl; << std::endl;
} }
@ -230,7 +230,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
if (this->IsTargetGroup()) if (this->IsTargetGroup())
{ {
*this->GetFolderBuildStreams() *this->GetFolderBuildStreams()
<< " {optgroup=GhsCommonOptions} -o \"" << outputDir << " -o \"" << outputDir
<< outputFilename << ".elf\"" << std::endl; << outputFilename << ".elf\"" << std::endl;
*this->GetFolderBuildStreams() << " :extraOutputFile=\"" << outputDir *this->GetFolderBuildStreams() << " :extraOutputFile=\"" << outputDir
<< outputFilename << ".elf.ael\"" << outputFilename << ".elf.ael\""
@ -238,7 +238,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config,
} }
else else
{ {
*this->GetFolderBuildStreams() << " {optgroup=GhsCommonOptions} -o \"" *this->GetFolderBuildStreams() << " -o \""
<< outputDir << outputFilename << ".as\"" << outputDir << outputFilename << ".as\""
<< std::endl; << std::endl;
} }