diff --git a/Makefile.inc1 b/Makefile.inc1 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -206,6 +206,15 @@ .else X${BINUTIL}?= ${${BINUTIL}} .endif +.if defined(CROSS_BINUTILS_PREFIX) && \ + exists(${CROSS_BINUTILS_PREFIX}/${OBJDUMP}) +XOBJDUMP?= ${CROSS_BINUTILS_PREFIX:C,/*$,,}/${OBJDUMP} +.elif defined(CROSS_BINUTILS_PREFIX) && \ + exists(${CROSS_BINUTILS_PREFIX}/llvm-objdump) +XOBJDUMP?= ${CROSS_BINUTILS_PREFIX:C,/*$,,}/llvm-objdump +.else +XOBJDUMP?= ${OBJDUMP} +.endif .endfor # If a full path to an external linker is given, don't build lld. @@ -828,6 +837,7 @@ CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" ELFCTL="${XELFCTL}" LD="${XLD}" \ LLVM_LINK="${XLLVM_LINK}" NM=${XNM} OBJCOPY="${XOBJCOPY}" \ + OBJDUMP="${XOBJDUMP}" \ RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \ SIZE="${XSIZE}" STRIPBIN="${XSTRIPBIN}" diff --git a/share/mk/local.sys.dirdeps.mk b/share/mk/local.sys.dirdeps.mk --- a/share/mk/local.sys.dirdeps.mk +++ b/share/mk/local.sys.dirdeps.mk @@ -63,7 +63,7 @@ .endif # toolchains can be a pain - especially bootstrappping them -TOOLCHAIN_VARS= AS AR CC CLANG_TBLGEN CXX CPP LD NM OBJCOPY RANLIB \ +TOOLCHAIN_VARS= AS AR CC CLANG_TBLGEN CXX CPP LD NM OBJCOPY OBJDUMP RANLIB \ STRINGS SIZE LLVM_TBLGEN _toolchain_bin_CLANG_TBLGEN= /usr/bin/clang-tblgen _toolchain_bin_LLVM_TBLGEN= /usr/bin/llvm-tblgen diff --git a/share/mk/sys.mk b/share/mk/sys.mk --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -238,6 +238,8 @@ OBJCOPY ?= objcopy +OBJDUMP ?= objdump + PC ?= pc PFLAGS ?=