simplify tools/xsan_build now that make runs ninja
BUG=skia:
R=borenet@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/257613004
git-svn-id: http://skia.googlecode.com/svn/trunk@14356 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/Makefile b/Makefile
index a51d6da..1b15a74 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@
VALID_TARGETS := \
bench \
debugger \
+ dm \
everything \
gm \
most \
diff --git a/tools/xsan_build b/tools/xsan_build
index f4d82e9..f3c4d74 100755
--- a/tools/xsan_build
+++ b/tools/xsan_build
@@ -2,7 +2,7 @@
# Build Skia with one of Clang's many sanitizers.
#
-# $ tools/xsan_build {address,thread,undefined,etc.} [any other flags to pass to make/ninja...]
+# $ tools/xsan_build {address,thread,undefined,etc.} [any other flags to pass to make...]
#
# This script assumes the use of Clang >=3.2.
#
@@ -17,18 +17,15 @@
export CC="$(which clang)"
export CXX="$(which clang++)"
-export LINK="$(which clang)"
-if [[ -z "${CC}" ]] || [[ -z "${CXX}" ]] || [[ -z "${LINK}" ]]; then
+if [[ -z "${CC}" ]] || [[ -z "${CXX}" ]]; then
echo "Couldn't find Clang on this machine!"
exit 1
fi
-export GYP_DEFINES="skia_sanitizer=$sanitizer ${GYP_DEFINES}"
+echo "CC=$CC"
+echo "CXX=$CXX"
+$CC --version
-./gyp_skia
-if [[ $GYP_GENERATORS == "ninja" ]]; then
- ninja ${args}
-else
- make ${args}
-fi
+export GYP_DEFINES="skia_sanitizer=$sanitizer ${GYP_DEFINES}"
+make ${args}