mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 18:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-fix-sysconf-non-limit'

Browse Source 
92fe00d3 Ninja: Fix command line limit when sysconf has no ARG_MAX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !633
This commit is contained in:
Brad King
2017-03-28 14:14:35 +00:00
committed by Kitware Robot
parent 21499431e0 92fe00d33c
commit 4d97086848
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

@@ -544,10 +544,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,
@@ -556,7 +552,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;
}