Commit e5fce89e authored by David Cole's avatar David Cole Committed by Kitware Robot

Merge topic 'ninja-rspfile-link-libraries'

42592966 Ninja: fix sytle
37998488 Ninja: fix GCC 4.7 warning -Wconversion
parents 17cb00e5 42592966
......@@ -495,7 +495,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
int commandLineLengthLimit = 8000 - linkRuleLength;
#elif defined(__linux) || defined(__APPLE__)
// 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
int commandLineLengthLimit = -1;
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment