diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-16 13:35:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-16 13:35:41 (GMT) |
| commit | 893ce307f9a9f50dbd324a4c72b833e4a3649b0a (patch) | |
| tree | 2023df58a566a8277d75c3058ab2c1729660bbf0 /Source/cmGhsMultiTargetGenerator.cxx | |
| parent | 02f8d51f48ae4abfec5491a8ab47be35a6671bab (diff) | |
| parent | ce7ccafce29a618392e05f99881c41f4a4a07125 (diff) | |
| download | CMake-893ce307f9a9f50dbd324a4c72b833e4a3649b0a.zip CMake-893ce307f9a9f50dbd324a4c72b833e4a3649b0a.tar.gz CMake-893ce307f9a9f50dbd324a4c72b833e4a3649b0a.tar.bz2 | |
Merge topic 'ghs-drop-optgroup'
ce7ccafc GHS: Remove extra flag to GHS MULTI compiler (#15771)
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 d6cbf75..c687ba7 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -217,7 +217,7 @@ void cmGhsMultiTargetGenerator::WriteTypeSpecifics(const std::string &config, if (this->GeneratorTarget->GetType() == cmState::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; } |