Documentation: more updates to site/dev/testing/xsan.md
No-Try: true
Docs-Preview: https://skia.org/dev/testing/xsan?cl=167393
Change-Id: I5b2a992c762221e45ea3e9dcfb97cc06a86e9bc5
Reviewed-on: https://skia-review.googlesource.com/c/167393
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/site/dev/testing/xsan.md b/site/dev/testing/xsan.md
index 280015e..e5108e9 100644
--- a/site/dev/testing/xsan.md
+++ b/site/dev/testing/xsan.md
@@ -23,12 +23,16 @@
------------------------------------------
This requires gsutil, part of the [gcloud sdk](https://cloud.google.com/sdk/downloads).
+<!--?prettify lang=sh?-->
+
CLANGDIR="${HOME}/clang"
python infra/bots/assets/clang_linux/download.py -t $CLANGDIR
Building Clang binaries from scratch (Other users)
---------------------------
+<!--?prettify lang=sh?-->
+
CLANGDIR="${HOME}/clang"
python tools/git-sync-deps
@@ -37,50 +41,48 @@
Configure and Compile Skia with MSAN
------------------------------------
+<!--?prettify lang=sh?-->
+
CLANGDIR="${HOME}/clang"
mkdir -p out/msan
cat > out/msan/args.gn <<- EOF
cc = "${CLANGDIR}/bin/clang"
cxx = "${CLANGDIR}/bin/clang++"
extra_cflags = [ "-B${CLANGDIR}/bin" ]
- extra_ldflags = [ "-B${CLANGDIR}/bin", "-fuse-ld=lld", "-L${CLANGDIR}/msan" ]
+ extra_ldflags = [
+ "-B${CLANGDIR}/bin",
+ "-fuse-ld=lld",
+ "-L${CLANGDIR}/msan",
+ "-Wl,-rpath,${CLANGDIR}/msan" ]
sanitize = "MSAN"
skia_use_fontconfig = false
- skia_use_system_freetype2 = false
- skia_enable_gpu = false
EOF
python tools/git-sync-deps
bin/gn gen out/msan
ninja -C out/msan
-When you run a binary built with MSAN, make sure you force it to use our
-MSAN-instrumented libc++:
-
- env LD_LIBRARY_PATH=$CLANGDIR/msan out/dm ...
-
Configure and Compile Skia with ASAN
------------------------------------
+<!--?prettify lang=sh?-->
+
CLANGDIR="${HOME}/clang"
mkdir -p out/asan
cat > out/asan/args.gn <<- EOF
cc = "${CLANGDIR}/bin/clang"
cxx = "${CLANGDIR}/bin/clang++"
sanitize = "ASAN"
- extra_ldflags = [ "-fuse-ld=lld" ]
+ extra_ldflags = [ "-fuse-ld=lld", "-Wl,-rpath,${CLANGDIR}/lib" ]
EOF
python tools/git-sync-deps
bin/gn gen out/asan
ninja -C out/asan
-
-To use the libc++ that comes with the above Clang asset:
-
- env LD_LIBRARY_PATH=$CLANGDIR/lib out/dm ...
-
Configure and Compile Skia with TSAN
------------------------------------
+<!--?prettify lang=sh?-->
+
CLANGDIR="${HOME}/clang"
mkdir -p out/tsan
cat > out/tsan/args.gn <<- EOF
@@ -88,9 +90,9 @@
cxx = "${CLANGDIR}/bin/clang++"
sanitize = "TSAN"
is_debug = false
+ extra_ldflags = [ "-Wl,-rpath,${CLANGDIR}/lib" ]
EOF
python tools/git-sync-deps
bin/gn gen out/tsan
ninja -C out/tsan
-