dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ninja: Fix command line limit when sysconf has no ARG_MAX

Browse Source 
The `sysconf(3)` manual explains that the return value can be `-1` for
limits if there is no definite limit.  Recognize this case and skip
using the value as a limit candidate.  Otherwise we use response files
unconditionally on such systems instead of checking other limits.

Fixes: #16740
This commit is contained in:
Christian Pfeiffer
2017-03-27 19:04:50 +02:00
committed by Brad King
parent 1adbe223cd
commit 92fe00d33c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmNinjaNormalTargetGenerator.cxx
View File

@@ -550,10 +550,6 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
#ifdef _WIN32 #ifdef _WIN32
8000, 8000,
#endif #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) #if defined(__linux)
// #define MAX_ARG_STRLEN (PAGE_SIZE * 32) in Linux's binfmts.h // #define MAX_ARG_STRLEN (PAGE_SIZE * 32) in Linux's binfmts.h
((int)sysconf(_SC_PAGESIZE) * 32) - 1000, ((int)sysconf(_SC_PAGESIZE) * 32) - 1000,
@@ -562,7 +558,15 @@ static int calculateCommandLineLengthLimit(int linkRuleLength)
}; };
size_t const arrSz = cmArraySize(limits); 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()) { if (sz == std::numeric_limits<int>::max()) {
return 0; return 0;
} }