diff --git a/bootstrap/command.go b/bootstrap/command.go index e56c6c1a8c2ad1a982bd1904e59adb975dabae07..1e3b2fe4ecde6693f3abf21f712f3efd4d9d881b 100644 --- a/bootstrap/command.go +++ b/bootstrap/command.go @@ -194,25 +194,6 @@ func Main(ctx *blueprint.Context, config interface{}, extraNinjaFileDeps ...stri out = ioutil.Discard } - err = ctx.WriteBuildFile(out) - if err != nil { - fatalf("error writing Ninja file contents: %s", err) - } - - if buf != nil { - err = buf.Flush() - if err != nil { - fatalf("error flushing Ninja file contents: %s", err) - } - } - - if f != nil { - err = f.Close() - if err != nil { - fatalf("error closing Ninja file: %s", err) - } - } - if globFile != "" { buffer, errs := generateGlobNinjaFile(ctx.Globs) if len(errs) > 0 { @@ -232,6 +213,25 @@ func Main(ctx *blueprint.Context, config interface{}, extraNinjaFileDeps ...stri } } + err = ctx.WriteBuildFile(out) + if err != nil { + fatalf("error writing Ninja file contents: %s", err) + } + + if buf != nil { + err = buf.Flush() + if err != nil { + fatalf("error flushing Ninja file contents: %s", err) + } + } + + if f != nil { + err = f.Close() + if err != nil { + fatalf("error closing Ninja file: %s", err) + } + } + if c, ok := config.(ConfigRemoveAbandonedFilesUnder); ok { under, except := c.RemoveAbandonedFilesUnder() err := removeAbandonedFilesUnder(ctx, bootstrapConfig, SrcDir, under, except)