Bug 1311462 - Dump symbols from */dist/bin instead of dist/universal for Mac universal builds. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 01 Nov 2016 14:05:27 +0900
changeset 363268 7d59e316811b4fe54b3df9adaa2312d4084dfe00
parent 363267 fd21663f4363ff852d9b9063a0a4742816cc14f9
child 363269 2279cd89545e292caf0699de82404c332549aecc
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-beta@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1311462
milestone52.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 1311462 - Dump symbols from */dist/bin instead of dist/universal for Mac universal builds. r=ted
Makefile.in
build/moz-automation.mk
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,18 +277,18 @@ else
 DUMP_SYMS_BIN ?= $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms_vc$(_MSC_VER).exe
 endif
 # PDB files don't get moved to dist, so we need to scan the whole objdir
 MAKE_SYM_STORE_PATH := .
 endif
 ifeq ($(OS_ARCH),Darwin)
 # need to pass arch flags for universal builds
 ifdef UNIVERSAL_BINARY
-MAKE_SYM_STORE_ARGS := -c -a 'i386 x86_64' --vcs-info
-MAKE_SYM_STORE_PATH := $(DIST)/universal
+MAKE_SYM_STORE_ARGS := -c --vcs-info
+MAKE_SYM_STORE_PATH := $(DIST)/bin $(UNIFY_DIST)/bin
 else
 MAKE_SYM_STORE_ARGS := -c -a $(OS_TEST) --vcs-info
 MAKE_SYM_STORE_PATH := $(DIST)/bin
 endif
 DUMP_SYMS_BIN ?= $(DIST)/host/bin/dump_syms
 endif
 ifeq (,$(filter-out Linux SunOS,$(OS_ARCH)))
 MAKE_SYM_STORE_ARGS := -c --vcs-info
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -83,22 +83,16 @@ automation/upload: automation/sdk
 # binaries/libs, and that's what we package/test.
 automation/pretty-package: automation/buildsymbols
 
 # The installer, sdk and packager all run stage-package, and may conflict
 # with each other.
 automation/installer: automation/package
 automation/sdk: automation/installer automation/package
 
-# Universal builds need package staging happening before buildsymbols
-# (bug 834228)
-ifdef UNIVERSAL_BINARY
-automation/buildsymbols: automation/package
-endif
-
 # The 'pretty' versions of targets run before the regular ones to avoid
 # conflicts in writing to the same files.
 automation/installer: automation/pretty-installer
 automation/package: automation/pretty-package
 automation/package-tests: automation/pretty-package-tests
 automation/l10n-check: automation/pretty-l10n-check
 automation/update-packaging: automation/pretty-update-packaging