summaryrefslogtreecommitdiff
path: root/moz
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2012-01-11 00:46:31 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2012-01-11 00:46:31 +0100
commit7cee57f336e3e24393e9280f41d82d372f9a2699 (patch)
treea078ada98c4bc76df9609d687f054c2be30a0cff /moz
parentabb1bcf7bf11e596d93960bf8ca16cf671e6a2d0 (diff)
ups, that part should not have been committed.
cross-compiling is broken currently when using separate nss
Diffstat (limited to 'moz')
-rw-r--r--moz/makefile.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 120c7317471c..eedae25551ee 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -345,7 +345,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)