From ce7ccafce29a618392e05f99881c41f4a4a07125 Mon Sep 17 00:00:00 2001 From: Geoff Viola Date: Wed, 14 Oct 2015 00:27:18 -0600 Subject: [PATCH] GHS: Remove extra flag to GHS MULTI compiler (#15771) Do not produce "{optgroup=GhsCommonOptions}" in the generated .gpj files. The flag was added originally to match an old project file, but it does not seem necessary and is not compatible with all GHS versions. --- Source/cmGhsMultiTargetGenerator.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 79e3a4c64..be54220c5 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -217,7 +217,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config, if (this->Target->GetType() == cmTarget::STATIC_LIBRARY) { - *this->GetFolderBuildStreams() << " {optgroup=GhsCommonOptions} -o \"" + *this->GetFolderBuildStreams() << " -o \"" << outputDir << outputFilename << ".a\"" << std::endl; } @@ -230,7 +230,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config, if (this->IsTargetGroup()) { *this->GetFolderBuildStreams() - << " {optgroup=GhsCommonOptions} -o \"" << outputDir + << " -o \"" << outputDir << outputFilename << ".elf\"" << std::endl; *this->GetFolderBuildStreams() << " :extraOutputFile=\"" << outputDir << outputFilename << ".elf.ael\"" @@ -238,7 +238,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config, } else { - *this->GetFolderBuildStreams() << " {optgroup=GhsCommonOptions} -o \"" + *this->GetFolderBuildStreams() << " -o \"" << outputDir << outputFilename << ".as\"" << std::endl; }