internal/rosa/cmake: pass parallel argument for make
Some checks failed
Test / Create distribution (push) Successful in 1m3s
Test / Flake checks (push) Has been cancelled
Test / Hakurei (push) Has started running
Test / Sandbox (push) Has started running
Test / Hakurei (race detector) (push) Has been cancelled
Test / ShareFS (push) Has been cancelled
Test / Sandbox (race detector) (push) Has been cancelled
Some checks failed
Test / Create distribution (push) Successful in 1m3s
Test / Flake checks (push) Has been cancelled
Test / Hakurei (push) Has started running
Test / Sandbox (push) Has started running
Test / Hakurei (race detector) (push) Has been cancelled
Test / ShareFS (push) Has been cancelled
Test / Sandbox (race detector) (push) Has been cancelled
This uses the default value for each build system, which is parallel for ninja but not for make. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -180,8 +180,10 @@ func (attr *CMakeHelper) script(name string) string {
|
||||
}
|
||||
|
||||
generate := "Ninja"
|
||||
jobs := ""
|
||||
if attr.Make {
|
||||
generate = "'Unix Makefiles'"
|
||||
jobs += ` "--parallel=$(nproc)"`
|
||||
}
|
||||
|
||||
return `
|
||||
@@ -198,7 +200,7 @@ cmake -G ` + generate + ` \
|
||||
}), " \\\n\t") + ` \
|
||||
-DCMAKE_INSTALL_PREFIX=/work/system \
|
||||
'/usr/src/` + name + `/` + path.Join(attr.Append...) + `'
|
||||
cmake --build .
|
||||
cmake --install .
|
||||
cmake --build .` + jobs + `
|
||||
` + attr.Script
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user