瀏覽代碼

Merge topic 'ninja-rspfile-link-libraries'

4259296 Ninja: fix sytle
3799848 Ninja: fix GCC 4.7 warning -Wconversion
David Cole 13 年之前
父節點
當前提交
e5fce89ea8
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Source/cmNinjaNormalTargetGenerator.cxx

+ 2 - 1
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