diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-12 16:36:31 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-12 16:51:36 +0100 |
| commit | 7e58b41bd7ce2714db1c7b1ca5b2708ff40b478a (patch) | |
| tree | 0218db36a19ca4a915f0bcf4a9ce508a1c12f128 | |
| parent | 21833f9456f6ad5bc06321ad6d9590f42ce0195c (diff) | |
| parent | c62475329e5e4c4c3f9570546e2b843288f48c61 (diff) | |
Merge #9973: depends: fix zlib build on osx
c624753 depends: fix zlib build on osx (Cory Fields)
Tree-SHA512: fd9343edc24762fc4b7eb9798f0fb6f76d5f5aeef16a0bc3bab5400cb8f9b3ae8a2d34b480f03c853bb31ff4e39c267a2b81cd86df0532f11976072354aa9378
| -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 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 |