diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-08 13:01:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-08 13:01:50 (GMT) |
| commit | 2369f19a7a2fceacad32e137f1eb61bebcf9c608 (patch) | |
| tree | 154896e85728761486bca702a909714131c47276 /Source/cmNinjaNormalTargetGenerator.cxx | |
| parent | 2f76effd0a8fd7bb25941891ca9603d27f1c571f (diff) | |
| parent | 7731e44f87ca9f70335f211a4ef64a1ea68c7f10 (diff) | |
| download | CMake-2369f19a7a2fceacad32e137f1eb61bebcf9c608.zip CMake-2369f19a7a2fceacad32e137f1eb61bebcf9c608.tar.gz CMake-2369f19a7a2fceacad32e137f1eb61bebcf9c608.tar.bz2 | |
Merge topic 'ninja-object-rsp'
7731e44f Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rules
f9644a2d cmGlobalNinjaGenerator: Clarify logic for forcing use of response files
24c9106b cmNinjaTargetGenerator: Factor out helper for forced response file check
Diffstat (limited to 'Source/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index c34df3c..322f37d 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -697,10 +697,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() cmGlobalNinjaGenerator& globalGen = *this->GetGlobalGenerator(); - int commandLineLengthLimit = 1; - const char* forceRspFile = "CMAKE_NINJA_FORCE_RESPONSE_FILE"; - if (!mf->IsDefinitionSet(forceRspFile) && - cmSystemTools::GetEnv(forceRspFile) == 0) + int commandLineLengthLimit = -1; + if (!this->ForceResponseFile()) { commandLineLengthLimit = calculateCommandLineLengthLimit( globalGen.GetRuleCmdLength(this->LanguageLinkerRule())); |