From 319b8a884d4190a0cba5c76f6ab3203f3a78f0d9 Mon Sep 17 00:00:00 2001 From: Ting-Yu Chou Date: Fri, 10 Mar 2017 12:24:02 +0800 Subject: [PATCH] Bug 1333003 part 4 - Package the binary of llvm-symbolizer also on Windows. r=ted MozReview-Commit-ID: 4nhVgQTJ7Bz --HG-- extra : rebase_source : 4df3d39da1847ff40927ec3d1f11f76916181a46 --- browser/installer/package-manifest.in | 4 ++-- build/moz.build | 3 +++ build/unix/moz.build | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 9a294ec2b455..0f1488380f1e 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -796,9 +796,9 @@ bin/libfreebl_32int64_3.so @RESPATH@/components/nsTerminatorTelemetry.js @RESPATH@/components/terminator.manifest -#if defined(CLANG_CXX) +#if defined(CLANG_CXX) || defined(CLANG_CL) #if defined(MOZ_ASAN) || defined(MOZ_TSAN) -@BINPATH@/llvm-symbolizer +@BINPATH@/llvm-symbolizer@BIN_SUFFIX@ #endif #endif diff --git a/build/moz.build b/build/moz.build index 13774b08e840..0f7230fddc41 100644 --- a/build/moz.build +++ b/build/moz.build @@ -45,6 +45,9 @@ OBJDIR_FILES += ['!/dist/bin/.gdbinit_python'] if CONFIG['MOZ_ASAN'] and CONFIG['CLANG_CL']: FINAL_TARGET_FILES += ['%' + CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']] +if CONFIG['LLVM_SYMBOLIZER']: + FINAL_TARGET_FILES += ['/' + CONFIG['LLVM_SYMBOLIZER']] + if CONFIG['MOZ_APP_BASENAME']: appini_defines = { 'TOPOBJDIR': TOPOBJDIR, diff --git a/build/unix/moz.build b/build/unix/moz.build index 3acc2c07aef1..95e5b92ac6c3 100644 --- a/build/unix/moz.build +++ b/build/unix/moz.build @@ -10,9 +10,6 @@ if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] or CONFIG['MOZ_LIBSTDCXX_HOST_VERSION' if CONFIG['USE_ELF_HACK']: DIRS += ['elfhack'] -if CONFIG['LLVM_SYMBOLIZER']: - FINAL_TARGET_FILES += ['/' + CONFIG['LLVM_SYMBOLIZER']] - FINAL_TARGET_FILES += [ 'run-mozilla.sh', ]