[Libreoffice-commits] .: libxmlsec/ExternalProject_xmlsec.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Dec 1 02:31:41 PST 2012


 libxmlsec/ExternalProject_xmlsec.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e1083e6656a378c2c37b6701b59c3fc2d10450d9
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Dec 1 11:30:36 2012 +0100

    fix(?) libxmlsec build with mingw
    
    for some reason there was an infinite loop during build, not sure why this
    makes a difference, but surely making it consistent with the other cases
    can't hurt

diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk
index 5c188b5..e5ed276 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -26,8 +26,8 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 	$(if $(filter NO,$(SYSTEM_NSS)),--disable-pkgconfig) \
 	CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
 	LDFLAGS="-Wl,--no-undefined $(ILIB:;= -L)" \
-	LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))"
-	$(MAKE) \
+	LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \
+	&& $(MAKE) \
 	&& touch $@
 
 else


More information about the Libreoffice-commits mailing list