diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-08 08:53:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-08 08:53:52 +0200 |
| commit | b02b3bcf4465c9ccb3edcaa26e090db0581cba9e (patch) | |
| tree | a6abc0da97fa60d99dd49bfbf027c18052360218 /external/cairo | |
| parent | fc670f637d4271246691904fd649358ce2e7be59 (diff) | |
ZLIB_LIBS must be passed into external/cairo as LIBS, not LDFLAGS
Change-Id: I76bd966d6932b3b3210d04137f18f928276ce631
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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" \ |