Merge topic 'ninja-rspfile-link-libraries'

4259296 Ninja: fix sytle 3799848 Ninja: fix GCC 4.7 warning -Wconversion
2012-07-24 17:02:21 -04:00 · 2012-07-24 17:02:21 -04:00 · e5fce89ea8
parent 17cb00e5dc 42592966c5
commit e5fce89ea8
1 changed files with 2 additions and 1 deletions
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@ -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