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

Unified Diff: tools/xsan_build

Issue 1665823002: Hack together MSAN build. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: abstract away Created 4 years, 11 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 | « src/images/SkImageDecoder_libjpeg.cpp ('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 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 $@
« no previous file with comments | « src/images/SkImageDecoder_libjpeg.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698