kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run ranlib on archives only if the tool is available

Browse Source 
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>
This commit is contained in:
Brad King 2016-06-08 10:15:29 -04:00
parent 1cfc750150
commit ea59867187
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -676,7 +676,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
i != archiveFinishCommands.end(); ++i) { i != archiveFinishCommands.end(); ++i) {
std::string cmd = *i; std::string cmd = *i;
this->LocalGenerator->ExpandRuleVariables(cmd, vars); 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 { } else {
// Get the set of commands. // Get the set of commands.

15
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -144,6 +144,14 @@ std::string cmNinjaNormalTargetGenerator::LanguageLinkerRule() const
this->GetGeneratorTarget()->GetName()); this->GetGeneratorTarget()->GetName());
} }
struct cmNinjaRemoveNoOpCommands
{
bool operator()(std::string const& cmd)
{
return cmd.empty() || cmd[0] == ':';
}
};
void cmNinjaNormalTargetGenerator::WriteLinkRule(bool useResponseFile) void cmNinjaNormalTargetGenerator::WriteLinkRule(bool useResponseFile)
{ {
cmState::TargetType targetType = this->GetGeneratorTarget()->GetType(); cmState::TargetType targetType = this->GetGeneratorTarget()->GetType();
@ -231,6 +239,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkRule(bool useResponseFile)
i != linkCmds.end(); ++i) { i != linkCmds.end(); ++i) {
this->GetLocalGenerator()->ExpandRuleVariables(*i, vars); this->GetLocalGenerator()->ExpandRuleVariables(*i, vars);
} }
{
// If there is no ranlib the command will be ":". Skip it.
std::vector<std::string>::iterator newEnd = std::remove_if(
linkCmds.begin(), linkCmds.end(), cmNinjaRemoveNoOpCommands());
linkCmds.erase(newEnd, linkCmds.end());
}
linkCmds.insert(linkCmds.begin(), "$PRE_LINK"); linkCmds.insert(linkCmds.begin(), "$PRE_LINK");
linkCmds.push_back("$POST_BUILD"); linkCmds.push_back("$POST_BUILD");
std::string linkCmd = std::string linkCmd =