diff options
| author | Florent Revest <revest@chromium.org> | 2024-10-15 09:39:08 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-10-15 08:24:09 +0000 |
| commit | eddfb4c900a3f4bd5d75464f55e42c818cf3e48e (patch) | |
| tree | 1aa38cec723600c133da79f76dbf088e96b24704 /pkg | |
| parent | 601564862a81ea5b1de0ab287c56a2735f8788f1 (diff) | |
pkg/build/bsd: use the number of CPUs provided in params in clean
Now that clean functions take a params, like builds, it makes sense to
use the BuildCPUs parameter rather than let each OS build implementation
extract the number of CPUs.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/freebsd.go | 3 | ||||
| -rw-r--r-- | pkg/build/netbsd.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkg/build/freebsd.go b/pkg/build/freebsd.go index 2d8ea0f77..c61b68f37 100644 --- a/pkg/build/freebsd.go +++ b/pkg/build/freebsd.go @@ -6,7 +6,6 @@ package build import ( "fmt" "path/filepath" - "runtime" "strconv" "strings" "time" @@ -121,7 +120,7 @@ sudo mdconfig -d -u ${md#md} func (ctx freebsd) clean(params Params) error { objPrefix := filepath.Join(params.KernelDir, "obj") - _, err := ctx.make(params.KernelDir, objPrefix, runtime.NumCPU(), "cleanworld") + _, err := ctx.make(params.KernelDir, objPrefix, params.BuildCPUs, "cleanworld") return err } diff --git a/pkg/build/netbsd.go b/pkg/build/netbsd.go index 8a6c4d216..31ae6de51 100644 --- a/pkg/build/netbsd.go +++ b/pkg/build/netbsd.go @@ -8,7 +8,6 @@ import ( "fmt" "os" "path/filepath" - "runtime" "strconv" "strings" "time" @@ -88,7 +87,7 @@ func (ctx netbsd) build(params Params) (ImageDetails, error) { func (ctx netbsd) clean(params Params) error { _, err := osutil.RunCmd(10*time.Minute, params.KernelDir, "./build.sh", "-m", params.TargetArch, - "-U", "-j"+strconv.Itoa(runtime.NumCPU()), "cleandir") + "-U", "-j"+strconv.Itoa(params.BuildCPUs), "cleandir") return err } |