diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-27 13:42:30 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-27 13:42:30 -0400 |
| commit | 8c94f5085d24bbc25f3f7fa421f7a62761a5515c (patch) | |
| tree | 2e47311bc6a827d3b464d58ffdf66527d24c956c | |
| parent | 3ed87b7ee1038f11e7d86988aca692c0773209b6 (diff) | |
| parent | 92fe00d33cb029a583de20a16e5bc17bd337ed57 (diff) | |
| download | cmake-8c94f5085d24bbc25f3f7fa421f7a62761a5515c.tar.gz | |
Merge branch 'ninja-fix-sysconf-non-limit' into release
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 4fc664d8f2..b1374c27bb 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -550,10 +550,6 @@ static int calculateCommandLineLengthLimit(int linkRuleLength) #ifdef _WIN32 8000, #endif -#if defined(_SC_ARG_MAX) - // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac - ((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) - 1000, @@ -562,7 +558,15 @@ static int calculateCommandLineLengthLimit(int linkRuleLength) }; size_t const arrSz = cmArraySize(limits); - int const sz = *std::min_element(limits, limits + arrSz); + int sz = *std::min_element(limits, limits + arrSz); +#if defined(_SC_ARG_MAX) + // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac + int const szArgMax = static_cast<int>(sysconf(_SC_ARG_MAX)); + // a return value of -1 signifies an unrestricted value + if (szArgMax != -1) { + sz = std::min(sz, szArgMax - 1000); + } +#endif if (sz == std::numeric_limits<int>::max()) { return 0; } |