diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-05 16:39:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-05 16:39:04 +0000 |
| commit | 058345b92f2005703e43e735634f3c29fd5d1027 (patch) | |
| tree | bc739f56c59086c47d73d28d49ddbb4355aa7213 /toolchain | |
| parent | 816d178941d91e9c69534fb27cb7e042bc6960b1 (diff) | |
| download | upstream-058345b92f2005703e43e735634f3c29fd5d1027.tar.gz upstream-058345b92f2005703e43e735634f3c29fd5d1027.tar.bz2 upstream-058345b92f2005703e43e735634f3c29fd5d1027.zip | |
kernel-headers: fix compile error caused by wrong host include path when the toolchain is already built
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27915 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 2a90e3d98a..b5aaa83c47 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -31,6 +31,8 @@ ifeq ($(strip $(BOARD)),uml) LINUX_KARCH:=$(subst x86_64,x86,$(subst i386,x86,$(ARCH))) endif +HOST_EXTRACFLAGS= + LINUX_HAS_HEADERS_INSTALL:=y KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \ @@ -41,7 +43,7 @@ KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \ KBUILD_HAVE_NLS=no \ CONFIG_SHELL=$(BASH) -define Host/Prepare/all +define Host/Configure/all mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev $(KMAKE) \ INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \ @@ -50,7 +52,7 @@ endef # XXX: the following is needed to build lzma-loader ifneq ($(CONFIG_mips)$(CONFIG_mipsel),) - define Host/Prepare/lzma + define Host/Configure/lzma $(CP) \ $(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \ $(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \ @@ -58,7 +60,7 @@ ifneq ($(CONFIG_mips)$(CONFIG_mipsel),) endef endif -define Host/Prepare/post/cris +define Host/Configure/post/cris $(CP) \ $(HOST_BUILD_DIR)/include/linux/user.h \ $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/linux/ @@ -67,7 +69,7 @@ define Host/Prepare/post/cris $(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/user.h endef -define Host/Prepare/post/ubicom32 +define Host/Configure/post/ubicom32 $(CP) \ $(HOST_BUILD_DIR)/arch/ubicom32/include/asm/elf.h \ $(HOST_BUILD_DIR)/arch/ubicom32/include/asm/user.h \ @@ -76,24 +78,25 @@ define Host/Prepare/post/ubicom32 $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/ endef -define Host/Prepare/post/mips - $(call Host/Prepare/lzma) +define Host/Configure/post/mips + $(call Host/Configure/lzma) endef -define Host/Prepare/post/mipsel - $(call Host/Prepare/lzma) +define Host/Configure/post/mipsel + $(call Host/Configure/lzma) endef define Host/Prepare $(call Kernel/Prepare/Default) ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux $(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile - yes '' | $(KMAKE) oldconfig - $(call Host/Prepare/all) - $(call Host/Prepare/post/$(ARCH)) endef define Host/Configure + env + yes '' | $(KMAKE) oldconfig + $(call Host/Configure/all) + $(call Host/Configure/post/$(ARCH)) endef define Host/Compile |