diff options
Diffstat (limited to 'cairo/ExternalProject_cairo.mk')
| -rw-r--r-- | cairo/ExternalProject_cairo.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 1aac70226948..90420f63dde3 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -33,12 +33,11 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ./configure \ $(if $(debug),STRIP=" ") \ CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" \ - LDFLAGS='-L$(OUTDIR)/lib' \ $(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ - ZLIB3RDLIB=-lz \ + ZLIB3RDLIB="$(if $(filter YES,$(SYSTEM_ZLIB)),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ |