[Libreoffice-commits] .: lcms2/ExternalProject_lcms2.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 8 18:45:44 PST 2012


 lcms2/ExternalProject_lcms2.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a8251cfed18a33a7f2e33e64060ec616d8d21fcc
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Thu Nov 8 21:45:59 2012 -0500

    make does not like commas
    
    Change-Id: Icc1e7f5be1a4c06242793948a07de20cf3e03b61

diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index 4a7a8eb..5b1eeea 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
 	cd $(EXTERNAL_WORKDIR) \
 	&& ./configure --without-jpeg --without-tiff --with-pic \
 	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-	$(if $(filter WNTGCC,$(OS)$(COM)),LDFLAGS="-Wl,--export-all-symbols -Wl,--enable-stdcall-fixup -Wl,--enable-runtime-pseudo-reloc-v2") \
+	$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--export-all-symbols -Wl,--enable-stdcall-fixup -Wl,--enable-runtime-pseudo-reloc-v2") \
 	CPPFLAGS=" $(SOLARINC)" \
 	$(if $(filter IOS ANDROID,$(OS)),--disable-shared, --enable-shared --disable-static) \
 	&& cd src \


More information about the Libreoffice-commits mailing list