diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-25 13:36:21 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-25 08:36:47 -0500 |
| commit | d1d8daf15adfc6fc23cabbf37e230d0445b70405 (patch) | |
| tree | cdfd36e55ab7fceb17ad5887af61fea9befb18cb | |
| parent | 499e36d932910186e1c1db1cc0d18fe93e47ee55 (diff) | |
| parent | c4dc6485eb3bd51fdc88eee03218b9755c373282 (diff) | |
| download | cmake-d1d8daf15adfc6fc23cabbf37e230d0445b70405.tar.gz | |
Merge topic 'xl-qoptfile'
c4dc6485 XL: Enable use of response files for includes and objects
e342e410 Makefile,Ninja: Use tool-specific response file flag for include dirs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1691
| -rw-r--r-- | Modules/Compiler/XL.cmake | 2 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 9 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 12 |
3 files changed, 19 insertions, 4 deletions
diff --git a/Modules/Compiler/XL.cmake b/Modules/Compiler/XL.cmake index 4783785708..e527a049eb 100644 --- a/Modules/Compiler/XL.cmake +++ b/Modules/Compiler/XL.cmake @@ -20,6 +20,8 @@ macro(__compiler_xl lang) # Feature flags. set(CMAKE_${lang}_VERBOSE_FLAG "-V") set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-qpic") + set(CMAKE_${lang}_RESPONSE_FILE_FLAG "-qoptfile=") + set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "-qoptfile=") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O") diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 1543536614..5d80e775b2 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1653,10 +1653,17 @@ void cmMakefileTargetGenerator::AddIncludeFlags(std::string& flags, } if (useResponseFile) { + std::string const responseFlagVar = + "CMAKE_" + lang + "_RESPONSE_FILE_FLAG"; + std::string responseFlag = + this->Makefile->GetSafeDefinition(responseFlagVar); + if (responseFlag.empty()) { + responseFlag = "@"; + } std::string name = "includes_"; name += lang; name += ".rsp"; - std::string arg = "@" + + std::string arg = std::move(responseFlag) + this->CreateResponseFile(name.c_str(), includeFlags, this->FlagFileDepends[lang]); this->LocalGenerator->AppendFlags(flags, arg); diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 4f37882f29..a4424638e5 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -447,14 +447,20 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang) std::string flags = "$FLAGS"; std::string rspfile; std::string rspcontent; - std::string responseFlag; bool const lang_supports_response = !(lang == "RC" || lang == "CUDA"); if (lang_supports_response && this->ForceResponseFile()) { + std::string const responseFlagVar = + "CMAKE_" + lang + "_RESPONSE_FILE_FLAG"; + std::string responseFlag = + this->Makefile->GetSafeDefinition(responseFlagVar); + if (responseFlag.empty()) { + responseFlag = "@"; + } rspfile = "$RSP_FILE"; - responseFlag = "@" + rspfile; + responseFlag += rspfile; rspcontent = " $DEFINES $INCLUDES $FLAGS"; - flags = responseFlag; + flags = std::move(responseFlag); vars.Defines = ""; vars.Includes = ""; } |