Skip to content

Commit

Permalink
Bug 1361256 part 2 - Avoid mozconfig failures when clang-cl has't bee…
Browse files Browse the repository at this point in the history
…n 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

--HG--
extra : rebase_source : d851e4ae7f465bced1dce2774f871dce9313c8e3
  • Loading branch information
janus926 committed May 15, 2017
1 parent e06ddac commit c848955
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions build/win64/mozconfig.asan
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
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
Expand Down

0 comments on commit c848955

Please sign in to comment.