[Cmake-commits] CMake branch, next, updated. v3.6.0-870-gdd96dd9

[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  dd96dd9740d83a1de6e7071862f09f0e8c0e38c6 (commit)
       via  5ec17e610609b8ca80cf8ce4f33f8c03ea48a090 (commit)
      from  26dea7c28b9eb1a747253e9ffffe9beb3f985c1a (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=dd96dd9740d83a1de6e7071862f09f0e8c0e38c6
commit dd96dd9740d83a1de6e7071862f09f0e8c0e38c6
Merge: 26dea7c 5ec17e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 15 09:51:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 15 09:51:39 2016 -0400

    Merge topic 'ninja-portable-arg-max' into next
    
    5ec17e61 Ninja: Generalize check for sysconf(3) call


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ec17e610609b8ca80cf8ce4f33f8c03ea48a090
commit 5ec17e610609b8ca80cf8ce4f33f8c03ea48a090
Author:     Raphael Kubo da Costa <rakuco at FreeBSD.org>
AuthorDate: Fri Jul 15 12:46:53 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 15 09:50:59 2016 -0400

    Ninja: Generalize check for sysconf(3) call
    
    Use `sysconf(_SC_ARG_MAX)` wherever `_SC_ARG_MAX` is available instead
    of hard-coding an incomplete list of operating systems that implement
    it.  In particular, it is available on BSD platforms that were not
    previously listed.

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 81a1618..1e83722 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -374,7 +374,7 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
 #ifdef _WIN32
     8000,
 #endif
-#if defined(__APPLE__) || defined(__HAIKU__) || defined(__linux)
+#if defined(_SC_ARG_MAX)
     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
     ((int)sysconf(_SC_ARG_MAX)) - 1000,
 #endif

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

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


hooks/post-receive
-- 
CMake