2828

1 files changed, 13 insertions, 3 deletions

diff --git a/build_and_test_until b/build_and_test_until
index 15e0e4cd..96eb9e43 100755
--- a/build_and_test_until
+++ b/build_and_test_until
@@ -9,6 +9,16 @@ make --no-print-directory enumerate/enumerate
 ./tangle/tangle $(./enumerate/enumerate --until $1 |grep -v '.mu$') |grep -v "^\s*//:" > mu.cc
 cat /dev/null $(./enumerate/enumerate --until $1 |grep '.mu$') > core.mu
 make --no-print-directory autogenerated_lists
-sleep 1  # Darwin is shit and otherwise thinks mu_bin is newer than the files it just generated when called from test_all_layers.
-         # All sorts of strange bugs ensue.
-CXX=${CXX:-clang++} CFLAGS=${CFLAGS:-"-O3 -fsanitize=undefined -Wno-tautological-constant-out-of-range-compare"} make ${2:-valgrind}
+set +v
+if [ `uname` == "Darwin" ]
+then
+  # Darwin is shit and otherwise thinks mu_bin is newer than the files it just
+  # generated when called from test_all_layers.
+  # All sorts of strange bugs ensue.
+  sleep 1
+  set -v  # Darwin's clang and valgrind is shit.
+  CFLAGS=${CFLAGS:-"-g -O3"} make test
+else
+  set -v
+  CXX=${CXX:-clang++} CFLAGS=${CFLAGS:-"-O3 -fsanitize=undefined -Wno-tautological-constant-out-of-range-compare"} make ${2:-valgrind}
+fi