Bug 1333003 part 4 - Package the binary of llvm-symbolizer also on Windows. r=ted
☠☠ backed out by 4e945c008ca2 ☠ ☠
authorTing-Yu Chou <janus926@gmail.com>
Fri, 10 Mar 2017 12:24:02 +0800
changeset 399683 70114135bd8c54caf9a34b93bf3217a3e0012ddc
parent 399682 5715b15e33c0feb9963bfcf579168ba09559410d
child 399684 1ba027abdfc9551f9f2a8819c438426a37eb993b
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1333003
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1333003 part 4 - Package the binary of llvm-symbolizer also on Windows. r=ted MozReview-Commit-ID: 4nhVgQTJ7Bz
browser/installer/package-manifest.in
build/moz.build
build/unix/moz.build
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -791,19 +791,19 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/pingsender@BIN_SUFFIX@
 
 @RESPATH@/components/dom_audiochannel.xpt
 
 ; Shutdown Terminator
 @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
 
 #if defined(MOZ_ASAN) && defined(CLANG_CL)
 @BINPATH@/clang_rt.asan_dynamic-*.dll
 #endif
 
 
--- a/build/moz.build
+++ b/build/moz.build
@@ -40,16 +40,19 @@ if CONFIG['MOZ_DMD']:
 FINAL_TARGET_FILES += ['/.gdbinit']
 FINAL_TARGET_PP_FILES += ['.gdbinit_python.in']
 OBJDIR_FILES += ['!/dist/bin/.gdbinit_python']
 
 # Install the clang-cl runtime library for ASAN next to the binaries we produce.
 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,
     }
 
     for var in ('GRE_MILESTONE', 'MOZ_APP_VERSION', 'MOZ_APP_BASENAME',
                 'MOZ_APP_VENDOR', 'MOZ_APP_ID', 'MAR_CHANNEL_ID',
                 'MOZ_APP_REMOTINGNAME'):
--- a/build/unix/moz.build
+++ b/build/unix/moz.build
@@ -5,14 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] or CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
     DIRS += ['stdc++compat']
 
 if CONFIG['USE_ELF_HACK']:
     DIRS += ['elfhack']
 
-if CONFIG['LLVM_SYMBOLIZER']:
-    FINAL_TARGET_FILES += ['/' + CONFIG['LLVM_SYMBOLIZER']]
-
 FINAL_TARGET_FILES += [
     'run-mozilla.sh',
 ]