author | Mike Hommey <mh+mozilla@glandium.org> |
Tue, 29 Jan 2013 09:35:53 +0100 | |
changeset 120172 | b02f1d2eafb73d670905a3cc5d521a08110e2d3f |
parent 120171 | 4631eeae9ff4505721dffb0fc4f65b395e4a73ae |
child 120173 | 03c3ae8323bdb0a2933cd2d6bdde611a3a2f49e6 |
push id | 24239 |
push user | ryanvm@gmail.com |
push date | Tue, 29 Jan 2013 14:36:31 +0000 |
treeherder | mozilla-central@d3a5e1de98b0 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 835164, 834228 |
milestone | 21.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
|
--- a/build/macosx/universal/flight.mk +++ b/build/macosx/universal/flight.mk @@ -23,17 +23,17 @@ core_abspath = $(if $(filter /%,$(1)),$( DIST = $(OBJDIR)/dist postflight_all: 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) \ + $(MAKE) -C $(OBJDIR_ARCH_1)/$(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-package-stage # automation.py differs because it hardcodes a path to # dist/bin. It doesn't matter which one we use.