Commit bd11de08 authored by Brad King's avatar Brad King

Makefile: Allow "gmake target1 target2 -j" (#14312)

Add the .NOTPARALLEL target to each local Makefile command-line
interface entry point file so that even with -j we launch only
one "make -f Makefile2" at a time.  The actual build rules
in Makefile2 and lower will still run in parallel.

Do not add .NOTPARALLEL for Borland or Watcom make tools because
they do not tolerate it.  Other make tools that do not understand
.NOTPARALLEL will not be hurt.
Suggested-by: Robert Luberda's avatarRobert Luberda <robert-cmake@debian.org>
parent 2a384e08
......@@ -44,6 +44,8 @@ public:
*/
virtual void EnableLanguage(std::vector<std::string>const& languages,
cmMakefile *, bool optional);
virtual bool AllowNotParallel() const { return false; }
};
#endif
......@@ -125,6 +125,9 @@ public:
const std::string &workingDirectory,
const std::string &compileCommand);
/** Does the make tool tolerate .NOTPARALLEL? */
virtual bool AllowNotParallel() const { return true; }
protected:
void WriteMainMakefile2();
void WriteMainCMakefile();
......
......@@ -43,6 +43,8 @@ public:
*/
virtual void EnableLanguage(std::vector<std::string>const& languages,
cmMakefile *, bool optional);
virtual bool AllowNotParallel() const { return false; }
};
#endif
......@@ -1686,6 +1686,17 @@ void cmLocalUnixMakefileGenerator3
"default_target",
depends,
no_commands, true);
// Help out users that try "gmake target1 target2 -j".
cmGlobalUnixMakefileGenerator3* gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
if(gg->AllowNotParallel())
{
std::vector<std::string> no_depends;
this->WriteMakeRule(ruleFileStream,
"Allow only one \"make -f Makefile2\" at a time, but pass parallelism.",
".NOTPARALLEL", no_depends, no_commands, true);
}
}
this->WriteSpecialTargetsTop(ruleFileStream);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment