aboutsummaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorGreg Steuck <gnezdo@google.com>2018-12-18 10:54:56 -0800
committerDmitry Vyukov <dvyukov@google.com>2018-12-19 17:15:31 +0100
commita8b6d1af463e35f9543b1a79e61b662790dd3d4f (patch)
tree7f6d3a704cd8cf4434bff9092522ea1960061829 /pkg
parentfe2dc057b5b155d1dc10dbdcdc629dd9598aea02 (diff)
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.
Diffstat (limited to 'pkg')
-rw-r--r--pkg/build/openbsd.go8
1 files changed, 6 insertions, 2 deletions
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 {