From f47b09faa431e78b06ff1c8a583ff562dfc5b774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Fri, 25 Jan 2019 16:55:37 +0100 Subject: [PATCH] makefiles/toolchain: fallback to 'objdump' When '$(PREFIX)objdump' is not present fallback to native '(g)objdump'. 'objdump' is used when flashing for some boards but the toolchain may not be installed when building in docker. This will allow using 'objdump' in 'cpu/kinetis/dist/check-fcfield.sh'. --- makefiles/toolchain/gnu.inc.mk | 3 ++- makefiles/toolchain/llvm.inc.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/makefiles/toolchain/gnu.inc.mk b/makefiles/toolchain/gnu.inc.mk index a65d433c7d..7bf9e2f395 100644 --- a/makefiles/toolchain/gnu.inc.mk +++ b/makefiles/toolchain/gnu.inc.mk @@ -18,6 +18,7 @@ ifeq ($(OBJCOPY),) $(warning objcopy not found. Hex file will not be created.) export OBJCOPY = true endif -export OBJDUMP = $(PREFIX)objdump +# Default to the native (g)objdump, helps when using toolchain from docker +export OBJDUMP ?= $(or $(shell command -v $(PREFIX)objdump || command -v gobjdump),objdump) # We use GDB for debugging include $(RIOTMAKE)/tools/gdb.inc.mk diff --git a/makefiles/toolchain/llvm.inc.mk b/makefiles/toolchain/llvm.inc.mk index f005ca7092..aac9c10ea9 100644 --- a/makefiles/toolchain/llvm.inc.mk +++ b/makefiles/toolchain/llvm.inc.mk @@ -25,7 +25,8 @@ ifeq ($(OBJCOPY),) $(warning objcopy not found. Hex file will not be created.) export OBJCOPY = true endif -export OBJDUMP = $(LLVMPREFIX)objdump +# Default to the native (g)objdump, helps when using toolchain from docker +export OBJDUMP ?= $(or $(shell command -v $(LLVMPREFIX)objdump || command -v gobjdump),objdump) export SIZE = $(LLVMPREFIX)size # LLVM lacks a binutils strip tool as well... #export STRIP = $(LLVMPREFIX)strip