diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-05 18:51:08 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-05 18:51:53 +0100 |
| commit | 6645eaf0ab30b20401528872ed78f344a6e6805f (patch) | |
| tree | 1a342f94a03509a9f2566084a3676d637cd5a3f2 | |
| parent | d77b4a7bcf23baf10c8a37d6a0f4b6ee2f0300b2 (diff) | |
| parent | 992f5687620c4346bc38286202a60ba2b6178c0b (diff) | |
| download | bitcoin-6645eaf0ab30b20401528872ed78f344a6e6805f.tar.xz | |
Merge #12466: depends: Only use D_DARWIN_C_SOURCE when building miniupnpc on darwin
992f56876 depends: Only use D_DARWIN_C_SOURCE when building miniupnpc on darwin (fanquake)
Pull request description:
Only use D_DARWIN_C_SOURCE when building on darwin, so we don't inadvertently introduce issues elsewhere.
cc @theuni
Tree-SHA512: e49a8456ba2b9925c06e62c73e139152b6d63cc5a4cee66944e41c863ca9103e98ac81a5718eceb3d0885a677fc53ece34062b02c304a05c3280e094965e856a
| -rw-r--r-- | depends/packages/miniupnpc.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk index 9976db43c2..5ad2b580d2 100644 --- a/depends/packages/miniupnpc.mk +++ b/depends/packages/miniupnpc.mk @@ -6,10 +6,9 @@ $(package)_sha256_hash=90dda8c7563ca6cd4a83e23b3c66dbbea89603a1675bfdb852897c2c9 define $(package)_set_vars $(package)_build_opts=CC="$($(package)_cc)" -$(package)_build_opts_darwin=OS=Darwin LIBTOOL="$($(package)_libtool)" +$(package)_build_opts_darwin=LIBTOOL="$($(package)_libtool)" $(package)_build_opts_mingw32=-f Makefile.mingw $(package)_build_env+=CFLAGS="$($(package)_cflags) $($(package)_cppflags)" AR="$($(package)_ar)" -$(package)_build_env+=CFLAGS=-D_DARWIN_C_SOURCE endef define $(package)_preprocess_cmds |