Index: tools/xsan_build |
diff --git a/tools/xsan_build b/tools/xsan_build |
index f3c4d746a01e8c01bce6fb633ef397e233354fc9..d1960bccad732c6c98b5aaae75d01fd22f062aca 100755 |
--- a/tools/xsan_build |
+++ b/tools/xsan_build |
@@ -10,22 +10,16 @@ |
# http://clang.llvm.org/docs/UsersManual.html#controlling-code-generation |
set -e |
+set -x |
-sanitizer=$1 |
-shift |
-args="$@" |
- |
-export CC="$(which clang)" |
-export CXX="$(which clang++)" |
+export CC=clang |
+export CXX=clang++ |
+$CC --version |
-if [[ -z "${CC}" ]] || [[ -z "${CXX}" ]]; then |
- echo "Couldn't find Clang on this machine!" |
- exit 1 |
+if [[ "$1" == "memory" ]]; then |
+ export GYP_DEFINES="skia_gpu=0 skia_no_fontconfig=1 skia_freetype_static=1 ${GYP_DEFINES}" |
fi |
+export GYP_DEFINES="skia_sanitizer=$1 ${GYP_DEFINES}" |
-echo "CC=$CC" |
-echo "CXX=$CXX" |
-$CC --version |
- |
-export GYP_DEFINES="skia_sanitizer=$sanitizer ${GYP_DEFINES}" |
-make ${args} |
+shift |
+make $@ |