Bug 1333003 part 4 - Package the binary of llvm-symbolizer also on Wi…

…ndows. r=ted MozReview-Commit-ID: 4nhVgQTJ7Bz --HG-- extra : rebase_source : 4df3d39da1847ff40927ec3d1f11f76916181a46
dothq · Mar 10, 2017 · 337e68f · 337e68f
1 parent f2c09ab
commit 337e68f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -800,9 +800,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
@@ -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
@@ -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',
 ]