diff options
| author | David Cole <david.cole@kitware.com> | 2012-07-24 21:02:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-07-24 21:02:21 (GMT) |
| commit | e5fce89ea881aeff6b3d813e2227289c12b1c8f5 (patch) | |
| tree | 6e1232a2a87be31f3f20fd7bf72ba980c681852a /Source | |
| parent | 17cb00e5dc5e6da85b6c33f5bf495ffae6f8af4a (diff) | |
| parent | 42592966c514015cef070d6b24a0c29f22ac2999 (diff) | |
| download | CMake-e5fce89ea881aeff6b3d813e2227289c12b1c8f5.zip CMake-e5fce89ea881aeff6b3d813e2227289c12b1c8f5.tar.gz CMake-e5fce89ea881aeff6b3d813e2227289c12b1c8f5.tar.bz2 | |
Merge topic 'ninja-rspfile-link-libraries'
4259296 Ninja: fix sytle
3799848 Ninja: fix GCC 4.7 warning -Wconversion
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index be7739e..5c9bf78 100644 --- 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 |