diff --git a/waterbox/libcxx/do-everything.sh b/waterbox/libcxx/do-everything.sh
index 08529191cd..417c4db72b 100755
--- a/waterbox/libcxx/do-everything.sh
+++ b/waterbox/libcxx/do-everything.sh
@@ -1,11 +1,16 @@
 #!/bin/sh
 set -e
 ./setup-llvm.sh
-./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"
+
+configure_and_install () {
+	build_dir=build$1
+	./configure-for-waterbox-phase-$1
+	cmake --build $build_dir
+	cmake --install $build_dir
+	printf "completed phase $1\n"
+}
+
+configure_and_install -
+configure_and_install 0
+configure_and_install 1
+configure_and_install 2