kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ninja-rspfile-link-libraries' 

4259296 Ninja: fix sytle
3799848 Ninja: fix GCC 4.7 warning -Wconversion
This commit is contained in:
David Cole 2012-07-24 17:02:21 -04:00 committed by CMake Topic Stage
parent 17cb00e5dc 42592966c5
commit e5fce89ea8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -495,7 +495,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
int commandLineLengthLimit = 8000 - linkRuleLength; int commandLineLengthLimit = 8000 - linkRuleLength;
#elif defined(__linux) || defined(__APPLE__) #elif defined(__linux) || defined(__APPLE__)
// for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
int commandLineLengthLimit = sysconf(_SC_ARG_MAX) - linkRuleLength - 1000; int commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))
- linkRuleLength - 1000;
#else #else
int commandLineLengthLimit = -1; int commandLineLengthLimit = -1;
#endif #endif