[Libreoffice-commits] .: moz/makefile.mk

Christian Lohmaier cloph at kemper.freedesktop.org
Tue Jan 10 15:46:38 PST 2012


 moz/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7cee57f336e3e24393e9280f41d82d372f9a2699
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Jan 11 00:46:31 2012 +0100

    ups, that part should not have been committed.
    
    cross-compiling is broken currently when using separate nss

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 120c731..eedae25 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)
 


More information about the Libreoffice-commits mailing list