Bug 747005: OSX XULRunner SDKs aren't getting named propertl. r=bsmedberg, a=lsblakk
authorDave Townsend <dtownsend@oxymoronical.com>
Mon, 23 Apr 2012 07:11:19 -0700
changeset 95424 85abf12e5c83b480f75bea9d42b0e2b136c6ab80
parent 95423 6b26bdffa1bc8e79d72bc9986764177f1c914c3b
child 95425 09750e764b6acf3c84f033fc5ea25b128ecede4d
child 95454 b552a2a7638be4374f1b11051c2d16d0226268d2
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, lsblakk
bugs747005
milestone14.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 747005: OSX XULRunner SDKs aren't getting named propertl. r=bsmedberg, a=lsblakk
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -90,16 +90,19 @@ PACKAGE       = $(PKG_PATH)$(PKG_BASENAM
 SDK_PATH      = $(PKG_PATH)
 ifeq ($(MOZ_APP_NAME),xulrunner)
 SDK_PATH = sdk/
 # Don't codesign xulrunner internally
 MOZ_INTERNAL_SIGNING_FORMAT =
 endif
 SDK_SUFFIX    = $(PKG_SUFFIX)
 SDK           = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX)
+ifdef UNIVERSAL_BINARY
+SDK           = $(SDK_PATH)$(PKG_BASENAME)-$(TARGET_CPU).sdk$(SDK_SUFFIX)
+endif
 
 # JavaScript Shell packaging
 ifndef LIBXUL_SDK
 JSSHELL_BINS  = \
   $(DIST)/bin/js$(BIN_SUFFIX) \
   $(DIST)/bin/$(DLL_PREFIX)mozglue$(DLL_SUFFIX) \
   $(NULL)
 ifndef MOZ_NATIVE_NSPR