diff options
| author | fanquake <fanquake@gmail.com> | 2024-04-03 10:24:37 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-03 10:26:33 +0100 |
| commit | 5aff45a90aa4183211b423dfc6364dd6c1806fc9 (patch) | |
| tree | 38b8d2eb2fe3f7467d071f24775a18464b938d73 /depends | |
| parent | 43735252c58217aaee19aa3e7d024525f457d64b (diff) | |
| parent | 2de2ea2ff63b97eacb23234932c6e1f1f65e4494 (diff) | |
| download | bitcoin-5aff45a90aa4183211b423dfc6364dd6c1806fc9.tar.xz | |
Merge bitcoin/bitcoin#29665: build, depends: Fix `libmultiprocess` cross-compilation
2de2ea2ff63b97eacb23234932c6e1f1f65e4494 build, depends: Fix `libmultiprocess` cross-compilation (Hennadii Stepanov)
Pull request description:
On the master branch @ 3b12fc7bcd94cf214984911f68612feb468d5404, 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 2de2ea2ff63b97eacb23234932c6e1f1f65e4494
fanquake:
ACK 2de2ea2ff63b97eacb23234932c6e1f1f65e4494 - 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
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/libmultiprocess.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk index 765d649377..c292c49bfb 100644 --- a/depends/packages/libmultiprocess.mk +++ b/depends/packages/libmultiprocess.mk @@ -20,7 +20,7 @@ define $(package)_config_cmds endef define $(package)_build_cmds - $(MAKE) + $(MAKE) multiprocess endef define $(package)_stage_cmds |