[Cmake-commits] CMake branch, next, updated. v3.1.0-2278-g6a5da86

[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  6a5da86d1eb53526ad48724cae6ce23151f56e0e (commit)
       via  0d348d07e683e97fde1e881b18dbca32ed3a66b2 (commit)
      from  ca646585aa25396915e4ac0411c2e166abe24c6d (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a5da86d1eb53526ad48724cae6ce23151f56e0e
commit 6a5da86d1eb53526ad48724cae6ce23151f56e0e
Merge: ca64658 0d348d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 21 11:55:37 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 21 11:55:37 2015 -0500

    Merge topic 'ninja-rsp_file-calculation' into next
    
    0d348d07 Ninja: Revise command line length limit computation (#14892)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d348d07e683e97fde1e881b18dbca32ed3a66b2
commit 0d348d07e683e97fde1e881b18dbca32ed3a66b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 21 11:53:52 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 21 11:53:52 2015 -0500

    Ninja: Revise command line length limit computation (#14892)

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index a926447..dd4bd48 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -359,29 +359,29 @@ cmNinjaNormalTargetGenerator
 
 static int calculateCommandLineLengthLimit(int linkRuleLength)
 {
-  static int limits[] = {
+  static int const limits[] = {
 #ifdef _WIN32
-    8000 - linkRuleLength,
+    8000,
 #endif
 #if defined(__APPLE__) || defined(__HAIKU__) || defined(__linux)
     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
-    ((int)sysconf(_SC_ARG_MAX)) - linkRuleLength - 1000,
+    ((int)sysconf(_SC_ARG_MAX)) - 1000,
 #endif
 #if defined(__linux)
     // #define MAX_ARG_STRLEN (PAGE_SIZE * 32) in Linux's binfmts.h
-    ((int)sysconf(_SC_PAGESIZE) * 32) - linkRuleLength - 1000,
+    ((int)sysconf(_SC_PAGESIZE) * 32) - 1000,
 #endif
     std::numeric_limits<int>::max()
   };
 
-  size_t arrSz = cmArraySize(limits);
-  int sz = *std::min_element(limits, limits + arrSz);
+  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 sz;
+  return sz - linkRuleLength;
 }
 
 

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake