highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-19 20:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#23673: build: Include native_X.mk before X.mk

Browse Source 
ef77549000 build: Include native_X.mk before X.mk (Hennadii Stepanov)

Pull request description:

  Unfortunately, our depends build system still lacks 100% reliability.

  On master (57982f419e):
  ```
  $ make --no-print-directory -C depends print-capnp_version MULTIPROCESS=1
  capnp_version=
  ```

  This PR fixes this issue:
  ```
  $ make --no-print-directory -C depends print-capnp_version MULTIPROCESS=1
  capnp_version=0.7.0
  ```

  This PR split off from bitcoin/bitcoin#22552, bitcoin/bitcoin#22555 and bitcoin/bitcoin#22708.

ACKs for top commit:
  Zero-1729:
    tACK ef77549000
  fanquake:
    ACK ef77549000

Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271
This commit is contained in:
fanquake
2021-12-10 20:55:29 +08:00
parent 011d6e429b ef77549000
commit 65b49f60a4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
depends/funcs.mk
View File

@@ -264,7 +264,8 @@ $(foreach package,$(packages),$(eval $(package)_type=$(host_arch)_$(host_os)))
$(foreach package,$(all_packages),$(eval $(call int_vars,$(package))))
#include package files
$(foreach package,$(all_packages),$(eval include packages/$(package).mk))
$(foreach native_package,$(native_packages),$(eval include packages/$(native_package).mk))
$(foreach package,$(packages),$(eval include packages/$(package).mk))
#compute a hash of all files that comprise this package's build recipe
$(foreach package,$(all_packages),$(eval $(call int_get_build_recipe_hash,$(package))))