Cleanup libcxx scripts

waterbox/libcxx/configure-for-waterbox-phase--

@@ -1,7 +1,8 @@
 #!/bin/sh
-MYPATH="`dirname \"$0\"`"
-SYSROOT="`realpath \"$MYPATH/../sysroot\"`"
-LLVMDIR="`realpath \"$MYPATH/../llvm-project\"`"
+set -e
+if [ -z "$SYSROOT" ]; then export SYSROOT="$(realpath "$(dirname "$0")/../sysroot")"; fi
+if [ -z "$LLVMDIR" ]; then export LLVMDIR="$(realpath "$(dirname "$0")/../llvm-project")"; fi
+
 rm -rf build-
 mkdir build-
 cd build-
@@ -22,4 +23,4 @@ cmake \
 	-DCMAKE_INSTALL_PREFIX="$SYSROOT" \
 	-DCMAKE_AR="/usr/bin/gcc-ar" \
 	-DCMAKE_RANLIB="/usr/bin/gcc-ranlib" \
-	../../llvm-project/compiler-rt
+	$LLVMDIR/compiler-rt

waterbox/libcxx/configure-for-waterbox-phase-0

@@ -1,7 +1,8 @@
 #!/bin/sh
-MYPATH="`dirname \"$0\"`"
-SYSROOT="`realpath \"$MYPATH/../sysroot\"`"
-LLVMDIR="`realpath \"$MYPATH/../llvm-project\"`"
+set -e
+if [ -z "$SYSROOT" ]; then export SYSROOT="$(realpath "$(dirname "$0")/../sysroot")"; fi
+if [ -z "$LLVMDIR" ]; then export LLVMDIR="$(realpath "$(dirname "$0")/../llvm-project")"; fi
+
 rm -rf build0
 mkdir build0
 cd build0
@@ -15,4 +16,4 @@ cmake \
 	-DCMAKE_INSTALL_PREFIX="$SYSROOT" \
 	-DCMAKE_AR="/usr/bin/gcc-ar" \
 	-DCMAKE_RANLIB="/usr/bin/gcc-ranlib" \
-	../../llvm-project/libunwind
+	$LLVMDIR/libunwind

waterbox/libcxx/configure-for-waterbox-phase-1

@@ -1,7 +1,8 @@
 #!/bin/sh
-MYPATH="`dirname \"$0\"`"
-SYSROOT="`realpath \"$MYPATH/../sysroot\"`"
-LLVMDIR="`realpath \"$MYPATH/../llvm-project\"`"
+set -e
+if [ -z "$SYSROOT" ]; then export SYSROOT="$(realpath "$(dirname "$0")/../sysroot")"; fi
+if [ -z "$LLVMDIR" ]; then export LLVMDIR="$(realpath "$(dirname "$0")/../llvm-project")"; fi
+
 rm -rf build1
 mkdir build1
 cd build1
@@ -23,4 +24,4 @@ cmake \
 	-DCMAKE_INSTALL_PREFIX="$SYSROOT" \
 	-DCMAKE_AR="/usr/bin/gcc-ar" \
 	-DCMAKE_RANLIB="/usr/bin/gcc-ranlib" \
-	../../llvm-project/libcxxabi
+	$LLVMDIR/libcxxabi

waterbox/libcxx/configure-for-waterbox-phase-2

@@ -1,7 +1,7 @@
 #!/bin/sh
-MYPATH="`dirname \"$0\"`"
-SYSROOT="`realpath \"$MYPATH/../sysroot\"`"
-LLVMDIR="`realpath \"$MYPATH/../llvm-project\"`"
+set -e
+if [ -z "$SYSROOT" ]; then export SYSROOT="$(realpath "$(dirname "$0")/../sysroot")"; fi
+if [ -z "$LLVMDIR" ]; then export LLVMDIR="$(realpath "$(dirname "$0")/../llvm-project")"; fi
 
 #libcxx needs this one trivial file to autodetect sendfile(2), which musl does support
 mkdir -p "$SYSROOT/include/linux"
@@ -30,4 +30,4 @@ cmake \
 	-DCMAKE_INSTALL_PREFIX="$SYSROOT" \
 	-DCMAKE_AR="/usr/bin/gcc-ar" \
 	-DCMAKE_RANLIB="/usr/bin/gcc-ranlib" \
-	../../llvm-project/libcxx
+	$LLVMDIR/libcxx

waterbox/libcxx/do-everything.sh

@@ -1,25 +1,10 @@
 #!/bin/sh
-
-./configure-for-waterbox-phase--
-cd build-
-make -j
-make install
-cd ..
-
-./configure-for-waterbox-phase-0
-cd build0
-make -j
-make install
-cd ..
-
-./configure-for-waterbox-phase-1
-cd build1
-make -j
-make install
-cd ..
-
-./configure-for-waterbox-phase-2
-cd build2
-make -j
-make install
-cd ..
+set -e
+./configure-for-waterbox-phase-- && cd build- && make -j && make install && cd ..
+printf "completed phase -1\n"
+./configure-for-waterbox-phase-0 && cd build0 && make -j && make install && cd ..
+printf "completed phase 0\n"
+./configure-for-waterbox-phase-1 && cd build1 && make -j && make install && cd ..
+printf "completed phase 1\n"
+./configure-for-waterbox-phase-2 && cd build2 && make -j && make install && cd ..
+printf "completed phase 2\n"