Skip to content

Commit 5aff45a

Browse files
committed
Merge bitcoin/bitcoin#29665: build, depends: Fix libmultiprocess cross-compilation
2de2ea2 build, depends: Fix `libmultiprocess` cross-compilation (Hennadii Stepanov) Pull request description: On the master branch @ 3b12fc7, the following command fails: ``` $ make -C depends libmultiprocess HOST=arm64-apple-darwin MULTIPROCESS=1 ... [100%] Linking CXX executable mpgen ... clang++: error: linker command failed with exit code 1 (use -v to see invocation) ... ``` This PR prevents building all default targets that include `mpgen`, which expectedly fails to link when cross-compiling. ACKs for top commit: ryanofsky: Code review ACK 2de2ea2 fanquake: ACK 2de2ea2 - I checked that this fixes the macOS cross-compilation issue. I'm assuming these packages are also likely to change further in the (near) future, given the changes going in upstream: https://github.com/chaincodelabs/libmultiprocess/pulls?q=is%3Apr+is%3Aclosed. Tree-SHA512: 563551afbe483c923b52c6171f9d73bcc30bc4febd821b5abfe8aadb2ac601b94c2d10a73746ace3710d9f0afa4798eb090e77ccb1ae66a819495912802d91c9
2 parents 4373525 + 2de2ea2 commit 5aff45a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

depends/packages/libmultiprocess.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ define $(package)_config_cmds
2020
endef
2121

2222
define $(package)_build_cmds
23-
$(MAKE)
23+
$(MAKE) multiprocess
2424
endef
2525

2626
define $(package)_stage_cmds

0 commit comments

Comments
 (0)