diff options
| -rw-r--r-- | Config.in | 4 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | package/Makefile.in | 5 |
3 files changed, 9 insertions, 10 deletions
@@ -88,7 +88,7 @@ source "target/device/Config.in.mirrors" config BR2_STAGING_DIR string "Toolchain and header file location?" - default "$(BUILD_DIR)/staging_dir" + default "$(BASE_DIR)/staging" help This is the location where the toolchain will be installed. The toolchain will not work if it is moved from this location. @@ -97,7 +97,7 @@ config BR2_STAGING_DIR will be used. Most people will leave this set to the default value of - "$(BUILD_DIR)/staging_dir". + "$(BASE_DIR)/staging". config BR2_FPU_SUFFIX bool "Add '_nofpu' suffix for softfloat toolchains" @@ -235,20 +235,20 @@ ifeq ($(DL_DIR),) DL_DIR:=$(BASE_DIR)/dl endif -BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)$(ARCH_FPU_SUFFIX) +BUILD_DIR:=$(BASE_DIR)/build GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX)) STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR)) # packages compiled for the host goes here -HOST_DIR:=$(BUILD_DIR)/host_dir +HOST_DIR:=$(BASE_DIR)/host # stamp (dependency) files go here -STAMP_DIR:=$(BUILD_DIR)/stamps +STAMP_DIR:=$(BASE_DIR)/stamps -BINARIES_DIR:=$(BASE_DIR)/binaries/ -TARGET_DIR:=$(BUILD_DIR)/target_dir +BINARIES_DIR:=$(BASE_DIR)/images +TARGET_DIR:=$(BASE_DIR)/target # define values for prepatched source trees for toolchains VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE)) diff --git a/package/Makefile.in b/package/Makefile.in index 093108dbd..1c2192488 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -112,7 +112,7 @@ COND_ARCH_FPU_SUFFIX:= endif ifeq ($(BR2_TOOLCHAIN_SOURCE),y) -TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX) +TOOL_BUILD_DIR=$(BASE_DIR)/toolchain # Quotes are needed for spaces et al in path components. TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)" @@ -124,8 +124,7 @@ KERNEL_CROSS=$(TARGET_CROSS) else TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) -#TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX) +TOOL_BUILD_DIR=$(BASE_DIR)/toolchain TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX) IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX) |