diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-30 14:50:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-30 14:50:09 (GMT) |
| commit | 3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9 (patch) | |
| tree | 893ee2cd45bc5d98a8770b9e631426573b7abb18 | |
| parent | ea7ca139ea4c3c88e432e722c9cfe1dd86a4359f (diff) | |
| download | CMake-3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9.zip CMake-3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9.tar.gz CMake-3cec0c75f73cc3d5c68cbb9e03e94ed38d60d0a9.tar.bz2 | |
Makefile: Generate .NOTPARALLEL without .PHONY (#14312)
In commit v3.0.0-rc1~222^2 (Makefile: Allow "gmake target1 target2 -j",
2013-12-18) we added generation of a .NOTPARALLEL rule and told the
generator it is "symbolic" because the file will never be created.
This causes ".PHONY" to be used. However, "clearmake" does not support
parsing of .PHONY specifically for .NOTPARALLEL, so simply drop it.
This should not affect the role of the .NOTPARALLEL rule for GNU make.
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index f825f5f..fbf2140 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1826,7 +1826,7 @@ void cmLocalUnixMakefileGenerator3 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); + ".NOTPARALLEL", no_depends, no_commands, false); } } |