diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-04-15 16:18:02 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-04-15 18:49:36 +0900 |
| commit | 520c36db6debd3e51b4d21395179b72a5b81cda2 (patch) | |
| tree | bb1fcb075b085af8443ad31c4ae5135000919184 /internal/rosa/cmake.go | |
| parent | 3352bb975bca696c8c4d2ed2f129c97514e013a4 (diff) | |
internal/rosa: respect preferred job count
This discontinues use of nproc, and also overrides detection behaviour in ninja.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/cmake.go')
| -rw-r--r-- | internal/rosa/cmake.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go index 6aa47fbd..52948669 100644 --- a/internal/rosa/cmake.go +++ b/internal/rosa/cmake.go @@ -91,7 +91,7 @@ index 2ead810437..f85cbb8b1c 100644 ConfigureName: "/usr/src/cmake/bootstrap", Configure: []KV{ {"prefix", "/system"}, - {"parallel", `"$(nproc)"`}, + {"parallel", jobsE}, {"--"}, {"-DCMAKE_USE_OPENSSL", "OFF"}, {"-DCMake_TEST_NO_NETWORK", "ON"}, @@ -170,10 +170,8 @@ func (attr *CMakeHelper) script(name string) string { } generate := "Ninja" - jobs := "" if attr.Make { generate = "'Unix Makefiles'" - jobs += ` "--parallel=$(nproc)"` } return ` @@ -191,7 +189,7 @@ cmake -G ` + generate + ` \ }), " \\\n\t") + ` \ -DCMAKE_INSTALL_PREFIX=/system \ '/usr/src/` + name + `/` + filepath.Join(attr.Append...) + `' -cmake --build .` + jobs + ` +cmake --build . --parallel=` + jobsE + ` cmake --install . --prefix=/work/system ` + attr.Script } |