Skip to content

Commit 109bfe9

Browse files
committed
Merge bitcoin/bitcoin#31857: depends: avoid an unset CMAKE_OBJDUMP
2434aea depends: avoid an unset CMAKE_OBJDUMP (fanquake) Pull request description: Similar to #31840, currently our Linux toolchain file contains: ```bash set(CMAKE_AR "aarch64-linux-gnu-ar") set(CMAKE_RANLIB "aarch64-linux-gnu-ranlib") set(CMAKE_STRIP "aarch64-linux-gnu-strip") set(CMAKE_OBJCOPY "aarch64-linux-gnu-objcopy") set(CMAKE_OBJDUMP "") ``` `objdump` is currently only used for the macOS cross build, where it's `llvm-objdump`, but we should be consistent in producing a toolchain file that points to actual tools, rather than leaving variables unset. ACKs for top commit: hebasto: ACK 2434aea. theuni: utACK 2434aea Tree-SHA512: 65f6b7b9cae79e9c0784c108709139125e52d8f2818afbea5f719bc1b6dc338b870abbdfcb174ae541c0027a7ac07cb56012735b7a37b58b9a6e55a48c0257cf
2 parents 14d1d8e + 2434aea commit 109bfe9

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

depends/hosts/default.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ default_host_RANLIB = $(host_toolchain)ranlib
99
default_host_STRIP = $(host_toolchain)strip
1010
default_host_NM = $(host_toolchain)nm
1111
default_host_OBJCOPY = $(host_toolchain)objcopy
12+
default_host_OBJDUMP = $(host_toolchain)objdump
1213

1314
define add_host_tool_func
1415
ifneq ($(filter $(origin $1),undefined default),)

0 commit comments

Comments
 (0)