Bug 818394 - Create objdir/x86_64/dist/universal symbolic link correctly. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 06 Dec 2012 17:06:38 +0100
changeset 115161 dedc2eaefa4989271719ec9cff37d5cbf18a6a79
parent 115160 008f2249f16d5e704fdd712c2fdee49ad8604119
child 115162 251478307d97c1c04f6d058293f95d1dfe083794
push id23975
push usermh@glandium.org
push dateThu, 06 Dec 2012 16:07:53 +0000
treeherdermozilla-central@3bb2d53dde34 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs818394
milestone20.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 818394 - Create objdir/x86_64/dist/universal symbolic link correctly. r=ted
build/macosx/universal/flight.mk
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -13,16 +13,18 @@ DIST_ARCH_1 = $(OBJDIR_ARCH_1)/dist
 DIST_ARCH_2 = $(OBJDIR_ARCH_2)/dist
 DIST_UNI = $(DIST_ARCH_1)/universal
 OBJDIR = $(OBJDIR_ARCH_1)
 endif
 
 topsrcdir = $(TOPSRCDIR)
 include $(OBJDIR)/config/autoconf.mk
 
+core_abspath = $(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1))
+
 DIST = $(OBJDIR)/dist
 
 ifdef LIBXUL_SDK # {
 APP_CONTENTS = Contents/Frameworks/XUL.framework
 else # } {
 APP_CONTENTS = Contents/MacOS
 endif # } LIBXUL_SDK
 
@@ -67,17 +69,17 @@ postflight_all:
 	      $(DIST_ARCH_2)/$(MOZ_PKG_APPNAME)/$(APPNAME)/$(APP_CONTENTS)/*.chk
 # The only difference betewen the two trees now should be the
 # about:buildconfig page.  Fix it up.
 	$(TOPSRCDIR)/build/macosx/universal/fix-buildconfig $(FIX_MODE) \
 	  $(DIST_ARCH_1)/$(MOZ_PKG_APPNAME)/$(APPNAME)/$(BUILDCONFIG) \
 	  $(DIST_ARCH_2)/$(MOZ_PKG_APPNAME)/$(APPNAME)/$(BUILDCONFIG)
 	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
 	rm -f $(DIST_ARCH_2)/universal
-	ln -s $(DIST_UNI) $(DIST_ARCH_2)/universal
+	ln -s $(call core_abspath,$(DIST_UNI)) $(DIST_ARCH_2)/universal
 	rm -rf $(DIST_UNI)/$(MOZ_PKG_APPNAME)/$(APPNAME)
 	$(TOPSRCDIR)/build/macosx/universal/unify \
           --unify-with-sort "\.manifest$$" \
           --unify-with-sort "components\.list$$" \
 	  $(DIST_ARCH_1)/$(MOZ_PKG_APPNAME)/$(APPNAME) \
 	  $(DIST_ARCH_2)/$(MOZ_PKG_APPNAME)/$(APPNAME) \
 	  $(DIST_UNI)/$(MOZ_PKG_APPNAME)/$(APPNAME)
 # A universal .dmg can now be produced by making in either architecture's