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

BUG: Removing jump-and-build ordering change until we can prevent extra jumps from always occuring.

This commit is contained in:
Brad King 2005-03-08 18:38:43 -05:00
parent 636f1587b5
commit 5a847aa7bf
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/cmLocalUnixMakefileGenerator2.cxx
View File

@ -3056,31 +3056,18 @@ cmLocalUnixMakefileGenerator2
makefileStream makefileStream
<< "# Targets to make sure needed libraries exist.\n" << "# Targets to make sure needed libraries exist.\n"
<< "# These will jump to other directories to build targets.\n" << "# These will jump to other directories to build targets.\n"
<< "# Note that extra dependencies are added to enforce an ordering\n"
<< "# that prevents parallel jumps.\n"
<< "\n"; << "\n";
} }
// Keep track of the last jump target written. std::vector<std::string> depends;
std::string lastJump; std::vector<std::string> commands;
// Add each jump rule.
for(std::map<cmStdString, RemoteTarget>::iterator for(std::map<cmStdString, RemoteTarget>::iterator
jump = m_JumpAndBuild.begin(); jump != m_JumpAndBuild.end(); ++jump) jump = m_JumpAndBuild.begin(); jump != m_JumpAndBuild.end(); ++jump)
{ {
const cmLocalUnixMakefileGenerator2::RemoteTarget& rt = jump->second; const cmLocalUnixMakefileGenerator2::RemoteTarget& rt = jump->second;
const char* destination = rt.m_BuildDirectory.c_str(); const char* destination = rt.m_BuildDirectory.c_str();
// Depend on the previously written jump rule to make sure only // Construct the dependency and build target names.
// one jump happens at a time. This avoids problems with multiple
// jump paths leading to the same target at the same time.
std::vector<std::string> depends;
if(!lastJump.empty())
{
depends.push_back(lastJump);
}
// Construct the dependency and build target names for the destination.
std::string dep = jump->first; std::string dep = jump->first;
dep += ".dir/"; dep += ".dir/";
dep += jump->first; dep += jump->first;
@ -3091,7 +3078,7 @@ cmLocalUnixMakefileGenerator2
tgt = this->ConvertToRelativeOutputPath(tgt.c_str()); tgt = this->ConvertToRelativeOutputPath(tgt.c_str());
// Add the pre-jump message. // Add the pre-jump message.
std::vector<std::string> commands; commands.clear();
std::string jumpPreEcho = "Jumping to "; std::string jumpPreEcho = "Jumping to ";
jumpPreEcho += rt.m_BuildDirectory.c_str(); jumpPreEcho += rt.m_BuildDirectory.c_str();
jumpPreEcho += " to build "; jumpPreEcho += " to build ";
@ -3153,9 +3140,6 @@ cmLocalUnixMakefileGenerator2
// Write the rule. // Write the rule.
this->WriteMakeRule(makefileStream, 0, this->WriteMakeRule(makefileStream, 0,
rt.m_FilePath.c_str(), depends, commands); rt.m_FilePath.c_str(), depends, commands);
// This is now the last jump target written.
lastJump = rt.m_FilePath;
} }
} }