Bug 1035599: Merge the mozilla-central and comm-central objdir - follow-up to fix Mac universal builds, rs=Standard8, a=bustage-fix on CLOSED TREE.
authorFlorian Quèze <florian@queze.net>
Tue, 12 Aug 2014 20:00:27 +0200
changeset 16457 cb779d2d4181e32c6aafba70d8909d7105e9e7cc
parent 16456 07a89a7ca9bc246db817277e1796cc47175d6dc5
child 16458 41799ab864139f0bcd635d9b2ebaa8f58373b17c
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-esr52@b5a0add9fb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, bustage-fix
bugs1035599
Bug 1035599: Merge the mozilla-central and comm-central objdir - follow-up to fix Mac universal builds, rs=Standard8, a=bustage-fix on CLOSED TREE.
build/macosx/universal/flight.mk
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -23,17 +23,17 @@ core_abspath = $(if $(filter /%,$(1)),$(
 DIST = $(OBJDIR)/mozilla/dist
 
 postflight_all:
 	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
 	rm -f $(DIST_ARCH_2)/universal
 	ln -s $(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)/$(MOZ_BUILD_APP)/installer \
+	$(MAKE) -C $(OBJDIR_ARCH_1)/mozilla/$(MOZ_BUILD_APP)/installer \
 	   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-stage
 # automation.py differs because it hardcodes a path to
 # dist/bin. It doesn't matter which one we use.