diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-22 09:22:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-22 09:23:20 +0100 |
| commit | 180a25596a29a553164266b882290fde6185cc0d (patch) | |
| tree | 91f888c470b9518d3260da2b491060ad323a6a9d /depends | |
| parent | 711d16ca4a916d4e30f17e2babb46fc1b0be4732 (diff) | |
| parent | a6365c5c3d277af355c51d7aee969f261dc5a751 (diff) | |
| download | bitcoin-180a25596a29a553164266b882290fde6185cc0d.tar.xz | |
Merge #11981: Fix gitian build after libzmq bump
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)
Pull request description:
Broken gitian builds were introduced with #9254. Big thanks to @jonasschnelli for narrowing down the bisection.
This is broken for a number of reasons, including:
- g++ understands "-static-libstdc++ -lstdc++" to mean "link against whatever libstdc++ exists, probably shared", which in itself is buggy.
- another stdlib (libc++ for example) may be in use
Tree-SHA512: d84968ee680f32ea799034ee516e9477fff2b1ef1b7c9a8ef1941631520ab196ecd50f5d64f3ed1c84113ead44be5e3ddf6ff2ae0277625bdeed05f1da89e017
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/zeromq.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 74bf4e9e11..3f97221e10 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -29,5 +29,6 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds + sed -i.old "s/ -lstdc++//" lib/pkgconfig/libzmq.pc && \ rm -rf bin share endef |