Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: tools/xsan_build

Issue 257613004: simplify tools/xsan_build now that make runs ninja (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Makefile ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/xsan_build
diff --git a/tools/xsan_build b/tools/xsan_build
index f4d82e9b9fdaf537e2737bed0dd6569501d9265b..f3c4d746a01e8c01bce6fb633ef397e233354fc9 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 @@ args="$@"
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}
« no previous file with comments | « Makefile ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698