Bug 1361256 part 2 - Avoid mozconfig failures when clang-cl has't been downloaded yet. r?glandium
The `cd $PATH && pwd` pattern no longer works because tooltool packages haven't
been downloaded yet when mach evaluates mozconfigs, check the directory
existence beforehand.
MozReview-Commit-ID: 68Axh1RWYUr
--- a/build/win64/mozconfig.asan
+++ b/build/win64/mozconfig.asan
@@ -1,19 +1,21 @@
ac_add_options --target=x86_64-pc-mingw32
ac_add_options --host=x86_64-pc-mingw32
-CLANG_LIB_DIR="$(cd $topsrcdir/clang/lib/clang/* && cd lib/windows && pwd)"
+if [ -d "$topsrcdir/clang" ]; then
+ CLANG_LIB_DIR="$(cd $topsrcdir/clang/lib/clang/* && cd lib/windows && pwd)"
-export LIB=$LIB:$CLANG_LIB_DIR
-mk_export_correct_style LIB
-export LDFLAGS="clang_rt.asan_dynamic-x86_64.lib clang_rt.asan_dynamic_runtime_thunk-x86_64.lib"
+ export LIB=$LIB:$CLANG_LIB_DIR
+ mk_export_correct_style LIB
+ export LDFLAGS="clang_rt.asan_dynamic-x86_64.lib clang_rt.asan_dynamic_runtime_thunk-x86_64.lib"
-export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer.exe"
-export MOZ_CLANG_RT_ASAN_LIB_PATH="${CLANG_LIB_DIR}/clang_rt.asan_dynamic-x86_64.dll"
+ export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer.exe"
+ export MOZ_CLANG_RT_ASAN_LIB_PATH="${CLANG_LIB_DIR}/clang_rt.asan_dynamic-x86_64.dll"
+fi
# Enable ASan specific code and build workarounds
ac_add_options --enable-address-sanitizer
# Mandatory options required for ASan builds
ac_add_options --enable-debug-symbols
ac_add_options --disable-install-strip
ac_add_options --disable-jemalloc