aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-10-18 16:49:26 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-10-18 16:49:26 +0200
commit5e89331114c7163dee70b8b0acf1cf59131ee6ce (patch)
tree097bdca86078e2d2c4b4f0cf1a76635d7308ca98
parent3793e65f9a57c598ffa412a52db1078c29b3ef65 (diff)
Do make-based toolchain bootstrap
-rwxr-xr-xbuildos11
1 files changed, 8 insertions, 3 deletions
diff --git a/buildos b/buildos
index 80ef375..17eef72 100755
--- a/buildos
+++ b/buildos
@@ -634,9 +634,13 @@ function toolchain_bootstrap () # <toolchain-name>
cd "build2-toolchain-$tv"*/
- # Bootstrap, stage, and install using the provided build.sh script.
+ # Bootstrap, stage, and install using the provided build.sh script. Do
+ # parallel bootstrap using make.
#
- if ! ./build.sh --install-dir "$id" --trust "$tt" g++; then
+ if ! ./build.sh --make "$cpu_total" \
+ --install-dir "$id" \
+ --trust "$tt" \
+ g++; then
info "failed to build $(pwd)"
break
fi
@@ -747,7 +751,8 @@ function bbot_start () # <toolchain-name> <toolchain-index>
fi
fi
- # Build and install the bbot agent.
+ # Build and install the bbot agent. Since other agents might already
+ # be running, limit the number of jobs to our slice.
#
if ! "${bpkg[@]}" --build-option --jobs --build-option "$cpu_slice" \
build --yes libbbot bbot; then