Skip to content

Commit 65b49f6

Browse files
committed
Merge bitcoin/bitcoin#23673: build: Include native_X.mk before X.mk
ef77549 build: Include native_X.mk before X.mk (Hennadii Stepanov) Pull request description: Unfortunately, our depends build system still lacks 100% reliability. On master (57982f4): ``` $ 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 ef77549 fanquake: ACK ef77549 Tree-SHA512: 9818277c82fcef778282a9fe854e48c6b6118cc757fcffa6fd4a2418e3de8b2a2b9d54e31804d22a53b28a28ffa5b8610c983add1969be0c4b3e13e0f2267271
2 parents 011d6e4 + ef77549 commit 65b49f6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

depends/funcs.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,8 @@ $(foreach package,$(packages),$(eval $(package)_type=$(host_arch)_$(host_os)))
264264
$(foreach package,$(all_packages),$(eval $(call int_vars,$(package))))
265265

266266
#include package files
267-
$(foreach package,$(all_packages),$(eval include packages/$(package).mk))
267+
$(foreach native_package,$(native_packages),$(eval include packages/$(native_package).mk))
268+
$(foreach package,$(packages),$(eval include packages/$(package).mk))
268269

269270
#compute a hash of all files that comprise this package's build recipe
270271
$(foreach package,$(all_packages),$(eval $(call int_get_build_recipe_hash,$(package))))

0 commit comments

Comments
 (0)