Bug 571367, turn production x86_64 builds into i386/x86_64 universal binaries (build system changes) r=ted
authorNick Thomas <nthomas@mozilla.com>
Mon, 27 Sep 2010 11:06:01 +1300
changeset 54657 3cd770c5b5db4409d7057b46c75773075f812ca7
parent 54656 49cc66b9f097b4b36c900eb81f9c24d738842c37
child 54658 6eb42326798b8e20c7ca8cb856a90a2aee8c8b14
push idunknown
push userunknown
push dateunknown
reviewersted
bugs571367
milestone2.0b7pre
Bug 571367, turn production x86_64 builds into i386/x86_64 universal binaries (build system changes) r=ted
Makefile.in
build/macosx/universal/mozconfig
build/macosx/universal/mozconfig-64
toolkit/mozapps/installer/package-name.mk
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,17 +143,17 @@ MAKE_SYM_STORE_ARGS += --vcs-info
 endif
 DUMP_SYMS_BIN ?= $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms.exe
 # 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 "ppc i386" --vcs-info
+MAKE_SYM_STORE_ARGS := -c -a "i386 x86_64" --vcs-info
 MAKE_SYM_STORE_PATH := $(DIST)/universal
 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)))
--- a/build/macosx/universal/mozconfig
+++ b/build/macosx/universal/mozconfig
@@ -1,7 +1,7 @@
-# ppc/i386 Universal Build mozconfig
+# i386/x86-64 Universal Build mozconfig
 
 # As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
 # to gcc's -arch parameter.
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
+mk_add_options MOZ_BUILD_PROJECTS="i386 x86_64"
 
 . $topsrcdir/build/macosx/universal/mozconfig.common
deleted file mode 100644
--- a/build/macosx/universal/mozconfig-64
+++ /dev/null
@@ -1,7 +0,0 @@
-# i386/x86-64 Universal Build mozconfig
-
-# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
-# to gcc's -arch parameter.
-mk_add_options MOZ_BUILD_PROJECTS="i386 x86_64"
-
-. $topsrcdir/build/macosx/universal/mozconfig.common
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -53,22 +53,26 @@ MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGE
 ifeq ($(OS_ARCH),WINNT)
 ifeq ($(TARGET_CPU),x86_64)
 MOZ_PKG_PLATFORM := win64-$(TARGET_CPU)
 else
 MOZ_PKG_PLATFORM := win32
 endif
 endif
 ifeq ($(OS_ARCH),Darwin)
+ifdef UNIVERSAL_BINARY
+MOZ_PKG_PLATFORM := mac64
+else
 ifeq ($(TARGET_CPU),x86_64)
 MOZ_PKG_PLATFORM := mac64
 else
 MOZ_PKG_PLATFORM := mac
 endif
 endif
+endif
 ifeq ($(TARGET_OS),linux-gnu)
 MOZ_PKG_PLATFORM := linux-$(TARGET_CPU)
 endif
 ifeq ($(OS_ARCH),OS2)
 MOZ_PKG_PLATFORM := os2
 endif
 ifeq ($(OS_ARCH),BeOS)
 ifeq (,$(filter-out 6.%, $(OS_RELEASE)))