[Libreoffice-commits] core.git: external/cairo

[Stephan Bergmann]

 external/cairo/ExternalProject_cairo.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b02b3bcf4465c9ccb3edcaa26e090db0581cba9e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 8 08:53:52 2017 +0200

    ZLIB_LIBS must be passed into external/cairo as LIBS, not LDFLAGS
    
    Change-Id: I76bd966d6932b3b3210d04137f18f928276ce631

diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 4938694151de..5acd6f349aee 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 		$(if $(filter ANDROID IOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \
 		$(if $(filter-out ANDROID IOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" ) \
 		$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
-		LDFLAGS="$(ZLIB_LIBS)" \
+		LIBS="$(ZLIB_LIBS)" \
 		pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
 		pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
 		png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \