[Cmake-commits] CMake branch, next, updated. v3.6.0-868-g26dea7c

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  26dea7c28b9eb1a747253e9ffffe9beb3f985c1a (commit)
       via  86dd2427bcb7cd1d912fc802f70b15556e776d62 (commit)
      from  d9606452ce72c28ea5fad450702ad732780b1a3e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26dea7c28b9eb1a747253e9ffffe9beb3f985c1a
commit 26dea7c28b9eb1a747253e9ffffe9beb3f985c1a
Merge: d960645 86dd242
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 15 09:46:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 15 09:46:51 2016 -0400

    Merge topic 'ninja-no-accidental-rsp' into next
    
    86dd2427 Ninja: Do not force response files when no sysconf(3) limit is used


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86dd2427bcb7cd1d912fc802f70b15556e776d62
commit 86dd2427bcb7cd1d912fc802f70b15556e776d62
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 15 09:37:03 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 15 09:43:02 2016 -0400

    Ninja: Do not force response files when no sysconf(3) limit is used
    
    Commit v3.6.0-rc1~174^2~1 (cmGlobalNinjaGenerator: Clarify logic for
    forcing use of response files, 2016-04-06) started using negative
    command line length values to represent forced use of response files but
    forgot to update `calculateCommandLineLengthLimit()` accordingly.  Teach
    it to return `0` instead of `-1` when no limit is computed from the
    system to avoid forcing response files.
    
    Reported-by: Raphael Kubo da Costa <rakuco at FreeBSD.org>

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;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake