From a8b6d1af463e35f9543b1a79e61b662790dd3d4f Mon Sep 17 00:00:00 2001 From: Greg Steuck Date: Tue, 18 Dec 2018 10:54:56 -0800 Subject: pkg/build/openbsd: always make clean to manage config in tree clean build barely takes 3 minutes end-to-end on our CI machine. Undo debug options which caused prevented kernels from booting on GCE. --- pkg/build/openbsd.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkg') diff --git a/pkg/build/openbsd.go b/pkg/build/openbsd.go index f37a6fde0..d7fe62f36 100644 --- a/pkg/build/openbsd.go +++ b/pkg/build/openbsd.go @@ -33,7 +33,7 @@ func (ctx openbsd) build(targetArch, vmType, kernelDir, outputDir, compiler, use if err := osutil.WriteFile(filepath.Join(compileDir, "Makefile"), makefile); err != nil { return err } - for _, tgt := range []string{"obj", "config", "all"} { + for _, tgt := range []string{"clean", "obj", "config", "all"} { if err := ctx.make(compileDir, tgt); err != nil { return err } @@ -57,7 +57,11 @@ func (ctx openbsd) build(targetArch, vmType, kernelDir, outputDir, compiler, use } func (ctx openbsd) clean(kernelDir string) error { - return ctx.make(kernelDir, "", "clean") + // Building clean is fast enough and incremental builds in face of + // changing config files don't work. Instead of optimizing for the + // case where humans have to think, let's bludgeon it with a + // machine. + return nil } func (ctx openbsd) make(kernelDir string, args ...string) error { -- cgit mrf-deployment