aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-10-19 15:15:41 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-10-19 15:26:26 +0200
commit3c1a4fa9ea692da7f451cb0d847b62dcf3e69c38 (patch)
tree624b2a32f55012a6fc88041c675db5a17c39396e
parentf483533b03ae7a04dc96adc489938c25b7e379de (diff)
Generalize --make argument to build.sh
-rwxr-xr-xbuild.sh14
1 files changed, 10 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index 818d3f3..97e9403 100755
--- a/build.sh
+++ b/build.sh
@@ -55,8 +55,8 @@ while test $# -ne 0; do
diag " --sudo <prog> Optional sudo program to use."
diag " --repo <loc> Alternative package repository location."
diag " --trust <fp> Certificate fingerprint to trust."
- diag " --make <jobs> Bootstrap using GNU make instead of script."
diag " --timeout <sec> Network operations timeout in seconds."
+ diag " --make <arg> Bootstrap using GNU make instead of script."
diag
diag "By default the script will install into /usr/local using sudo(1)."
diag "To use sudo for a custom installation directory you need to specify"
@@ -67,6 +67,12 @@ while test $# -ne 0; do
diag "The --trust option recognizes two special values: 'yes' (trust"
diag "everything) and 'no' (trust nothing)."
diag
+ diag "The --make option can be used to bootstrap using GNU make. The"
+ diag "first --make value should specify the make executable optionally"
+ diag "followed by additional make arguments, for example:"
+ diag
+ diag "$0 --make gmake --make -j8 g++"
+ diag
diag "See the BOOTSTRAP-UNIX file for details."
diag
exit 0
@@ -115,11 +121,11 @@ while test $# -ne 0; do
--make)
shift
if test $# -eq 0; then
- diag "error: number of jobs expected after --make"
+ diag "error: argument expected after --make"
diag "$usage"
exit 1
fi
- make="$1"
+ make="$make $1"
shift
;;
--timeout)
@@ -215,7 +221,7 @@ run cd build2
if test -z "$make"; then
run ./bootstrap.sh "$cxx"
else
- run make -f ./bootstrap.gmake -j "$make" "CXX=$cxx"
+ run $make -f ./bootstrap.gmake "CXX=$cxx"
fi
run build2/b-boot --version