Skip to content

Commit

Permalink
Merge bitcoin#11981: Fix gitian build after libzmq bump
Browse files Browse the repository at this point in the history
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with bitcoin#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
  • Loading branch information
laanwj authored and CryptoCentric committed Jul 2, 2021
1 parent dc6ddfc commit 7732bae
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions depends/packages/zeromq.mk
Expand Up @@ -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

0 comments on commit 7732bae

Please sign in to comment.