summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-10-06 14:19:13 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2013-10-06 18:54:37 (GMT)
commitc58a80b4cd6b620622e567218ded34104c6d46b6 (patch)
treeafa03d0a45e03316fc127ba8e0d84f7b4996eacc
parentd191c916272fcbac2fd12c4a064530743139dfe5 (diff)
downloadbuildroot-c58a80b4cd6b620622e567218ded34104c6d46b6.tar.gz
buildroot-c58a80b4cd6b620622e567218ded34104c6d46b6.tar.bz2
toolchain-external: make ext-tool.mk includable in all cases
The ext-tool.mk logic uses the TOOLCHAIN_EXTERNAL_PREFIX variable unconditionally, even if the external toolchain is not used. Until now this wasn't a problem since ext-tool.mk was only included when the external toolchain backend was selected, but the next patches are going to include this file unconditionally. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--toolchain/toolchain-external/ext-tool.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index db2a99e..8cfd1b1 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -1,4 +1,3 @@
-
#
# This file implements the support for external toolchains, i.e
# toolchains that have not been produced by Buildroot itself and that
@@ -112,8 +111,10 @@ TOOLCHAIN_EXTERNAL_DIR=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
endif
ifeq ($(TOOLCHAIN_EXTERNAL_DIR),)
+ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
# if no path set, figure it out from path
TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
+endif
else
ifeq ($(BR2_bfin),y)
TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin