summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-07-15 13:48:32 (GMT)
committerBrad King <brad.king@kitware.com>2016-07-15 13:48:32 (GMT)
commitace12c9c158eb2bb649daed699a6d38b7aa2ca6e (patch)
tree7a8b60daa48915d04b6d09eb717420a5b73ecbf3
parent8ab1989e934a1edca2ca5adf3453603838ef5ead (diff)
parent86dd2427bcb7cd1d912fc802f70b15556e776d62 (diff)
downloadCMake-ace12c9c158eb2bb649daed699a6d38b7aa2ca6e.zip
CMake-ace12c9c158eb2bb649daed699a6d38b7aa2ca6e.tar.gz
CMake-ace12c9c158eb2bb649daed699a6d38b7aa2ca6e.tar.bz2
Merge branch 'ninja-no-accidental-rsp' into release
-rw-r--r--Source/cmNinjaNormalTargetGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 3e91545..1386a04 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -354,7 +354,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
size_t const arrSz = cmArraySize(limits);
int const sz = *std::min_element(limits, limits + arrSz);
if (sz == std::numeric_limits<int>::max()) {
- return -1;
+ return 0;
}
return sz - linkRuleLength;