diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile | 8 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 7 | ||||
| -rw-r--r-- | toolchain/gdb/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/glibc-ports/Makefile | 7 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 7 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile | 10 |
8 files changed, 11 insertions, 44 deletions
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index b0b65f3..10902df 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -28,12 +28,8 @@ endif PATCH_DIR:=./patches/$(PKG_VERSION) REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) -override CONFIG_AUTOREBUILD= - -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk BINUTILS_CONFIGURE:= \ ./configure \ diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 4eabbbf..ac65270 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -33,13 +33,9 @@ endif PATCH_DIR:=./patches/$(PKG_VERSION) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR) +HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR) -override CONFIG_AUTOREBUILD= - -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.eglibc_built STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 10dab85..e2e8d28 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -47,12 +47,7 @@ endif PATCH_DIR=./patches/$(PKG_VERSION) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) - -override CONFIG_AUTOREBUILD= - -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index 4911fae..c09414d 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -14,10 +14,8 @@ PKG_MD5SUM:=05b928f41fa5b482e49ca2c24762a0ae PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/gdb PKG_CAT:=bzcat -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk define Host/Configure (cd $(HOST_BUILD_DIR); \ diff --git a/toolchain/glibc-ports/Makefile b/toolchain/glibc-ports/Makefile index a60b71f..836ca34 100644 --- a/toolchain/glibc-ports/Makefile +++ b/toolchain/glibc-ports/Makefile @@ -24,12 +24,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PATCH_DIR:=./patches/$(PKG_VERSION) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) - -override CONFIG_AUTOREBUILD= - -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc-ports_built STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc-ports_installed diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 73dbdd8..bfef152 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -24,12 +24,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PATCH_DIR:=./patches/$(PKG_VERSION) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) - -override CONFIG_AUTOREBUILD= - -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc_built STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc_installed diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 5fdfee9..0494514 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -9,12 +9,8 @@ include $(TOPDIR)/rules.mk KERNEL_BUILD_DIR := $(BUILD_DIR_TOOLCHAIN) BUILD_DIR := $(KERNEL_BUILD_DIR) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) - override QUILT:= override HOST_QUILT:= -override CONFIG_AUTOREBUILD= include $(INCLUDE_DIR)/kernel.mk @@ -26,7 +22,7 @@ HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM) LINUX_DIR := $(HOST_BUILD_DIR) -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk include $(INCLUDE_DIR)/kernel-defaults.mk ifeq ($(strip $(BOARD)),uml) diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index ce9acad..61dcaaa 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -51,17 +51,13 @@ ifeq ($(PKG_VERSION_SNAPSHOT),y) PKG_MD5SUM:= endif -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) ifeq ($(PKG_VERSION_SNAPSHOT),y) - HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_EXTRAVERSION) + HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_EXTRAVERSION) else - HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) + HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) endif -override CONFIG_AUTOREBUILD= - -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.uclibc_installed STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.uclibc-utils_installed |