summaryrefslogtreecommitdiff
path: root/liborcus
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-04-11 20:29:55 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-04-13 01:54:40 -0400
commita2fa2edb7e626034220340d7e1290d1da343fa03 (patch)
tree9bd437ac36c83bed514b6a8e9c1d7cbf8deb2ff9 /liborcus
parent4eb2211230d3ff327e8965a52953d0e83b031e91 (diff)
Fix linker error against system zlib.
Not sure what we'll have to do with the internal zlib. Not tested that scenario yet. Change-Id: Iec9e4f30b006ceaa2271156650b5ad922d4b40e4
Diffstat (limited to 'liborcus')
-rw-r--r--liborcus/ExternalProject_liborcus.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 4be704031956..ca98e8bf7c9e 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -45,6 +45,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
CXXFLAGS="$(BOOST_CXXFLAGS) $(if $(filter NO,$(SYSTEM_BOOST)),\
-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \
+ $(if $(filter YES,$(SYSTEM_ZLIB)),LIBS=-lz) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)