aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2017-03-10 16:53:03 -0500
committerMarcoFalke <falke.marco@gmail.com>2017-03-27 23:44:03 +0200
commite9611d10b67dd99bae83b32dedc9767b4c2e44d2 (patch)
tree1a9e66e49ebc8360d8aea33275ae212d4af9039d /depends
parentddc2dd16121b10da129d363530a365361435a849 (diff)
depends: fix zlib build on osx
zlib is sneaky and expects ar to be libtool on darwin. Github-Pull: #9973 Rebased-From: c62475329e5e4c4c3f9570546e2b843288f48c61
Diffstat (limited to 'depends')
-rw-r--r--depends/packages/zlib.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/depends/packages/zlib.mk b/depends/packages/zlib.mk
index 7ff5d00bbd..589490800f 100644
--- a/depends/packages/zlib.mk
+++ b/depends/packages/zlib.mk
@@ -7,8 +7,10 @@ $(package)_sha256_hash=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca11
define $(package)_set_vars
$(package)_build_opts= CC="$($(package)_cc)"
$(package)_build_opts+=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC"
-$(package)_build_opts+=AR="$($(package)_ar)"
$(package)_build_opts+=RANLIB="$($(package)_ranlib)"
+$(package)_build_opts+=AR="$($(package)_ar)"
+$(package)_build_opts_darwin+=AR="$($(package)_libtool)"
+$(package)_build_opts_darwin+=ARFLAGS="-o"
endef
define $(package)_config_cmds