BR2_TOOLCHAIN_EXTERNAL_BIN_PATH -> BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH

This commit is contained in:
Calin Crisan 2018-03-25 14:30:34 +03:00
parent 7bf81fe291
commit dfb309eb5e
3 changed files with 8 additions and 8 deletions

View File

@ -6,7 +6,7 @@ BR2_OPTIMIZE_2=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/raspberrypi/tools/archive/5caa7046982f0539cf5380f94da04b31129ed521.tar.gz" BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/raspberrypi/tools/archive/5caa7046982f0539cf5380f94da04b31129ed521.tar.gz"
BR2_TOOLCHAIN_EXTERNAL_BIN_PATH="/arm-bcm2708/arm-linux-gnueabihf/bin" BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH="arm-bcm2708/arm-linux-gnueabihf/bin"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf"
BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y

View File

@ -71,10 +71,10 @@ else
TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
endif endif
# if binary path unset (non-custom external toolchains), use "bin" # If binary path unset (known, supported external toolchains), use "bin".
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BIN_PATH),) TOOLCHAIN_EXTERNAL_REL_BIN_PATH = $(or \
BR2_TOOLCHAIN_EXTERNAL_BIN_PATH = bin $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH)), \
endif bin)
ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),) ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),) ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
@ -82,7 +82,7 @@ ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
TOOLCHAIN_EXTERNAL_BIN := $(dir $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc)) TOOLCHAIN_EXTERNAL_BIN := $(dir $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
endif endif
else else
TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_BIN_PATH)) TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_REL_BIN_PATH)
endif endif
# If this is a buildroot toolchain, it already has a wrapper which we want to # If this is a buildroot toolchain, it already has a wrapper which we want to

View File

@ -12,8 +12,8 @@ config BR2_TOOLCHAIN_EXTERNAL_URL
help help
URL of the custom toolchain tarball to download and install. URL of the custom toolchain tarball to download and install.
config BR2_TOOLCHAIN_EXTERNAL_BIN_PATH config BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH
string "Toolchain bin path" string "Toolchain relative bin path"
default "bin" default "bin"
depends on BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD depends on BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
help help