Commonalize the definition of TOOLCHAIN_DIR
The definition of TOOLCHAIN_DIR is the same regardless of whether external or internal toolchains are used. Moreover, move its definition together with all the other *_DIR definitions. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
4c57d9638f
commit
4c5bf461cd
1
Makefile
1
Makefile
@ -267,6 +267,7 @@ STAMP_DIR:=$(BASE_DIR)/stamps
|
||||
|
||||
BINARIES_DIR:=$(BASE_DIR)/images
|
||||
TARGET_DIR:=$(BASE_DIR)/target
|
||||
TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
|
||||
|
||||
BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
|
||||
|
||||
|
@ -105,7 +105,6 @@ ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
|
||||
TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
|
||||
|
||||
# Quotes are needed for spaces et al in path components.
|
||||
TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
|
||||
@ -116,7 +115,6 @@ KERNEL_CROSS=$(TARGET_CROSS)
|
||||
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
|
||||
TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
|
||||
TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
|
||||
TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
|
||||
TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
|
||||
REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
|
Loading…
Reference in New Issue
Block a user