From 91364b58fa5cc224e80209e28e62613ca36dc4a9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 14 Jun 2018 12:16:25 +0200 Subject: Command line interface redesign for bootstrap scripts --- etc/bootstrap/bbot-bootstrap-macos.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'etc/bootstrap/bbot-bootstrap-macos.sh') diff --git a/etc/bootstrap/bbot-bootstrap-macos.sh b/etc/bootstrap/bbot-bootstrap-macos.sh index 92aedaa..0163c49 100755 --- a/etc/bootstrap/bbot-bootstrap-macos.sh +++ b/etc/bootstrap/bbot-bootstrap-macos.sh @@ -6,6 +6,8 @@ # open -a Terminal -n -F ~/bbot-bootstrap-macos.sh +cxx=clang++ + if ! jobs="$(sysctl -n hw.ncpu)"; then jobs=1 fi @@ -14,15 +16,15 @@ fi # ulimit -c unlimited -# Note: bootstrap script options must come before build options. +# Note: bootstrap script options must come before build.sh options/arguments. # -"$(dirname "$0")/bbot-bootstrap.sh" \ - --cxx clang++ \ - --build /tmp \ - --environments "$HOME/environments" \ - "$@" \ - --make make \ - --make "-j$jobs" +"$(dirname "$0")/bbot-bootstrap.sh" \ +--build /tmp \ +--environments "$HOME/environments" \ +--make make \ +--jobs "$jobs" \ +"$cxx" \ +"$@" # If success, wait a bit and shutdown. Otherwise leave the machine running # for investigation. -- cgit v1.1