From 5e89331114c7163dee70b8b0acf1cf59131ee6ce Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 18 Oct 2017 16:49:26 +0200
Subject: Do make-based toolchain bootstrap

---
 buildos | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'buildos')

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
-- 
cgit v1.1