summaryrefslogtreecommitdiff
path: root/moz/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'moz/makefile.mk')
-rw-r--r--moz/makefile.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 94e942f97a5e..15480f54b830 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -95,7 +95,8 @@ PATCH_FILES = \
patches/link_fontconfig.patch \
patches/brokenmakefile.patch \
patches/aix_build_fix.patch \
- patches/libpr0n_build_fix.patch
+ patches/libpr0n_build_fix.patch \
+ patches/macosx_build_fix.patch
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
@@ -349,7 +350,7 @@ $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack
zip: \
$(MISC)$/CREATETARBALL
-.IF "$(GUIBASE)"=="aqua"
+.IF "$(GUIBASE)"=="aqua" && "$(CREATE_UNIVERSAL_MAC_MOZ_ZIP)"!=""
MOZ_ARCH=$(eq,$(CPU),I i386 ppc)
MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8)