diff options
| author | Cory Fields <[email protected]> | 2017-03-10 16:53:03 -0500 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2017-03-10 16:53:05 -0500 |
| commit | c62475329e5e4c4c3f9570546e2b843288f48c61 (patch) | |
| tree | d67143f633cf36c1e9883c3cc157b82b12e611cb | |
| parent | Merge #9768: [qa] Add logging to test_framework.py (diff) | |
| download | discoin-c62475329e5e4c4c3f9570546e2b843288f48c61.tar.xz discoin-c62475329e5e4c4c3f9570546e2b843288f48c61.zip | |
depends: fix zlib build on osx
zlib is sneaky and expects ar to be libtool on darwin.
| -rw-r--r-- | depends/packages/zlib.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/depends/packages/zlib.mk b/depends/packages/zlib.mk index 7ff5d00bb..589490800 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 |