diff options
| author | Geoff Viola <geoffrey.viola@asirobots.com> | 2015-10-14 06:27:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-15 13:56:47 (GMT) |
| commit | ce7ccafce29a618392e05f99881c41f4a4a07125 (patch) | |
| tree | 0d5519193169c217efd8104ee003fe410782a0f4 /Source/cmGhsMultiTargetGenerator.cxx | |
| parent | 8e394cf9e39babefdc991b67fa4fd1921735eb7e (diff) | |
| download | CMake-ce7ccafce29a618392e05f99881c41f4a4a07125.zip CMake-ce7ccafce29a618392e05f99881c41f4a4a07125.tar.gz CMake-ce7ccafce29a618392e05f99881c41f4a4a07125.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmGhsMultiTargetGenerator.cxx')
| -rw-r--r-- | Source/cmGhsMultiTargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 79e3a4c..be54220 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; } |