diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-08 14:15:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-08 16:00:44 (GMT) |
| commit | ea59867187e8bdb8a7ffda37ad58e7f8493ebf7c (patch) | |
| tree | 83de15eec6a989f77632fcbc1846440caffe0f11 /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 1cfc750150065ee3b65ad66d2b37a3b28a9e799d (diff) | |
| download | CMake-ea59867187e8bdb8a7ffda37ad58e7f8493ebf7c.zip CMake-ea59867187e8bdb8a7ffda37ad58e7f8493ebf7c.tar.gz CMake-ea59867187e8bdb8a7ffda37ad58e7f8493ebf7c.tar.bz2 | |
Run ranlib on archives only if the tool is available
CMakeFindBinUtils sets CMAKE_RANLIB to `:` if it is not available in
order to get a no-op. This does not work on a Windows host build
environment that runs commands in `cmd` instead of `sh`. Teach the
Ninja and Makefile generators to simply skip the command if it is `:`.
This this was already done by the Makefile generator since commit
v2.6.0~3161 (BUG: Do not write link script lines that use the ':',
2006-06-18), but only when using a link script.
Reported-by: Michael Jäntsch <Michael.Jaentsch@gmx.de>
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 128291d..0998eb8 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -676,7 +676,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules( i != archiveFinishCommands.end(); ++i) { std::string cmd = *i; this->LocalGenerator->ExpandRuleVariables(cmd, vars); - real_link_commands.push_back(cmd); + // If there is no ranlib the command will be ":". Skip it. + if (!cmd.empty() && cmd[0] != ':') { + real_link_commands.push_back(cmd); + } } } else { // Get the set of commands. |