From 23ecfd04e6987879b5b4fce8f89b1e6501d011f8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 15 Mar 2015 15:40:30 +0100 Subject: [PATCH] toolchain-external: fix support for non-ADI Blackfin external toolchains The computation of TOOLCHAIN_EXTERNAL_BIN has a special case for Blackfin, where it's set to $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin instead of $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin for other architectures. However, this is actually only true for Analog Devices pre-built toolchains. Other Blackfin external toolchains (such as ones built by Buildroot) do not have this special organization. Therefore, in order to make those non-ADI Blackfin toolchains work, we need to change the condition from BR2_bfin to testing specifically for the ADI toolchains. Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 44b8c83d48..9aa8123985 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -141,7 +141,7 @@ ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),) TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc)) endif else -ifeq ($(BR2_bfin),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y) TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin else TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin -- 2.30.2