summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-07-18 12:57:26 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-07-18 12:57:26 (GMT)
commitb224f431206339bd8cbff22b6948f30c28c87406 (patch)
tree95c1f294ded574005f9350283309957ff10d4245
parentb475599d587f9250d5062798832d1624ddde1805 (diff)
parent5ec17e610609b8ca80cf8ce4f33f8c03ea48a090 (diff)
downloadCMake-b224f431206339bd8cbff22b6948f30c28c87406.zip
CMake-b224f431206339bd8cbff22b6948f30c28c87406.tar.gz
CMake-b224f431206339bd8cbff22b6948f30c28c87406.tar.bz2
Merge topic 'ninja-portable-arg-max'
5ec17e61 Ninja: Generalize check for sysconf(3) call
-rw-r--r--Source/cmNinjaNormalTargetGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
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