summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-18 16:51:28 (GMT)
committerBrad King <brad.king@kitware.com>2015-03-18 16:55:27 (GMT)
commit80afe28a1084d02dc3e010c7a0cabf5258237ddc (patch)
treeed78b33be129a36921b29d4a23ae986a17f70d0d /Source
parent380db3de00bd74f01781ea93e9ba9cebdea000cc (diff)
downloadCMake-80afe28a1084d02dc3e010c7a0cabf5258237ddc.zip
CMake-80afe28a1084d02dc3e010c7a0cabf5258237ddc.tar.gz
CMake-80afe28a1084d02dc3e010c7a0cabf5258237ddc.tar.bz2
Ninja: Do not generate circular phony rules (#15454)
The phony rules added by commit v2.8.12~248^2 (Ninja: Custom Command file depends don't need to exist before building, 2013-06-07) are circular, e.g. build side-effect: phony side-effect This is not diagnosed by Ninja as of version 1.5, but the dependency does not make sense. Simply drop it and use phony rules of the form build side-effect: phony instead. Reported-by: Daniel Dunbar
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 69b1a9d..ac7a6eb 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1069,7 +1069,7 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
this->WritePhonyBuild(os,
"",
deps,
- deps);
+ cmNinjaDeps());
}
}
}