From d94b23885a6646571904c9f41599ffde487d6314 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 14 Jun 2021 15:06:34 -0400 Subject: cmNinjaTargetGenerator: Simplify scan rule response file selection Since commit 33a8e0bb09 (cmNinjaTargetGenerator: Simplify scan rule depfile selection, 2020-11-06, v3.20.0-rc1~516^2~1), the `$out` of the scan rule always matches our `.rsp` file selection, so use `$out.rsp`. --- Source/cmNinjaTargetGenerator.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 6080270..6543485 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -1118,11 +1118,7 @@ cmNinjaBuild GetScanBuildStatement(const std::string& ruleName, { cmNinjaBuild scanBuild(ruleName); - if (!ppFileName.empty()) { - scanBuild.RspFile = cmStrCat(ppFileName, ".rsp"); - } else { - scanBuild.RspFile = "$out.rsp"; - } + scanBuild.RspFile = "$out.rsp"; if (compilePP) { // Move compilation dependencies to the scan/preprocessing build statement. -- cgit v0.12