aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Johnston <markjdb@gmail.com>2023-01-19 12:15:05 -0500
committerDmitry Vyukov <dvyukov@google.com>2023-01-20 08:57:30 +0100
commit34bb5f72f3214035520348815ab63e15848ea8d5 (patch)
tree214f2ccb1342b52f2c6f1139bcbef873750073c5
parentdd15ff29447cea5d39835deb22eb494a56d6fe22 (diff)
pkg/build: try harder to get a clean build on FreeBSD
Commit 6f9c033e1 ("pkg/build: try a clean toolchain build on FreeBSD") doesn't appear to be sufficient, so let's try blowing away the entire object directory.
-rw-r--r--pkg/build/freebsd.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/build/freebsd.go b/pkg/build/freebsd.go
index e5349e93f..151aa126c 100644
--- a/pkg/build/freebsd.go
+++ b/pkg/build/freebsd.go
@@ -41,6 +41,9 @@ options DIAGNOSTIC
return ImageDetails{}, err
}
+ if _, err := osutil.RunCmd(10*time.Minute, params.KernelDir, "rm", "-rf", "obj"); err != nil {
+ return ImageDetails{}, err
+ }
objPrefix := filepath.Join(params.KernelDir, "obj")
if err := ctx.make(params.KernelDir, objPrefix, "kernel-toolchain"); err != nil {
return ImageDetails{}, err