Port bug 834228 - No symbols for XUL for Mac Nightly to help fix bustage. rs=bustage-fix CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 25 Jan 2013 08:36:39 +0000
changeset 14746 60d8bb04028c3ff1db70d8704eb7d6c3c6b018b1
parent 14745 32a5b24c900d17f7497bfbdc6fb4fa031a5f381a
child 14747 d82d65b26412dc67fafefacf9d7d8631657eed27
push id867
push userbugzilla@standard8.plus.com
push dateMon, 01 Apr 2013 20:44:27 +0000
treeherdercomm-beta@797726b8d244 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs834228
Port bug 834228 - No symbols for XUL for Mac Nightly to help fix bustage. rs=bustage-fix CLOSED TREE
build/macosx/universal/flight.mk
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -18,20 +18,24 @@ endif
 topsrcdir = $(TOPSRCDIR)
 include $(OBJDIR)/config/autoconf.mk
 
 core_abspath = $(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1))
 
 DIST = $(OBJDIR)/mozilla/dist
 
 postflight_all:
-ifdef ENABLE_TESTS
 	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
 	rm -f $(DIST_ARCH_2)/universal
 	ln -s $(call core_abspath,$(DIST_UNI)) $(DIST_ARCH_2)/universal
+# Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
+# actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
+	$(MAKE) -C $(OBJDIR_ARCH_1)/$(INSTALLER_DIR) \
+	   PKG_SKIP_STRIP=1 stage-package
+ifdef ENABLE_TESTS
 # Now, repeat the process for the test package.
 	$(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= CHROME_JAR= package-tests
 	$(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= CHROME_JAR= package-tests
 	rm -rf $(DIST_UNI)/test-package-stage
 # automation.py differs because it hardcodes a path to
 # dist/bin. It doesn't matter which one we use.
 	if test -d $(DIST_ARCH_1)/test-package-stage -a                 \
                 -d $(DIST_ARCH_2)/test-package-stage; then              \