From 2d9b59bc2062bd9105b25d0befb4dec29c88d7ba Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 18 Dec 2017 09:14:16 -0800 Subject: [PATCH] Store build.ninja deps in .ninja_deps We're already going to load the .ninja_deps file, so we may as well use it. These are the only two files in our build that don't. Test: dump the .ninja_deps file, see the dependencies --- bootstrap/bootstrap.go | 1 + bootstrap/build.ninja | 1 + 2 files changed, 2 insertions(+) diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go index 8d15229..4f7d916 100644 --- a/bootstrap/bootstrap.go +++ b/bootstrap/bootstrap.go @@ -113,6 +113,7 @@ var ( Command: "$builder $extra -b $buildDir -n $ninjaBuildDir -d $out.d -o $out $in", CommandDeps: []string{"$builder"}, Description: "$builder $out", + Deps: blueprint.DepsGCC, Depfile: "$out.d", Restat: true, }, diff --git a/bootstrap/build.ninja b/bootstrap/build.ninja index 74b8582..b338843 100644 --- a/bootstrap/build.ninja +++ b/bootstrap/build.ninja @@ -9,6 +9,7 @@ ninja_required_version = 1.7.0 rule build.ninja command = ${builder} ${extraArgs} -b ${bootstrapBuildDir} -n ${builddir} -d ${out}.d -o ${out} ${in} + deps = gcc depfile = ${out}.d description = ${builder} ${out}