domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-headers: fix compile error caused by wrong host include path when the toolchain is already built

Browse Source 
SVN-Revision: 27915
This commit is contained in:
Felix Fietkau
2011-08-05 16:39:04 +00:00
parent 55e020cd14
commit 2105acbe28
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
toolchain/kernel-headers/Makefile
View File

@@ -31,6 +31,8 @@ ifeq ($(strip $(BOARD)),uml)
LINUX_KARCH:=$(subst x86_64,x86,$(subst i386,x86,$(ARCH))) LINUX_KARCH:=$(subst x86_64,x86,$(subst i386,x86,$(ARCH)))
endif endif
HOST_EXTRACFLAGS=
LINUX_HAS_HEADERS_INSTALL:=y LINUX_HAS_HEADERS_INSTALL:=y
KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \ KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
@@ -41,7 +43,7 @@ KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \
KBUILD_HAVE_NLS=no \ KBUILD_HAVE_NLS=no \
CONFIG_SHELL=$(BASH) CONFIG_SHELL=$(BASH)
define Host/Prepare/all define Host/Configure/all
mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev
$(KMAKE) \ $(KMAKE) \
INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \ INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \
@@ -50,7 +52,7 @@ endef
# XXX: the following is needed to build lzma-loader # XXX: the following is needed to build lzma-loader
ifneq ($(CONFIG_mips)$(CONFIG_mipsel),) ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
define Host/Prepare/lzma define Host/Configure/lzma
$(CP) \ $(CP) \
$(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \ $(HOST_BUILD_DIR)/arch/mips/include/asm/asm.h \
$(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \ $(HOST_BUILD_DIR)/arch/mips/include/asm/regdef.h \
@@ -58,7 +60,7 @@ ifneq ($(CONFIG_mips)$(CONFIG_mipsel),)
endef endef
endif endif
define Host/Prepare/post/cris define Host/Configure/post/cris
$(CP) \ $(CP) \
$(HOST_BUILD_DIR)/include/linux/user.h \ $(HOST_BUILD_DIR)/include/linux/user.h \
$(BUILD_DIR_TOOLCHAIN)/linux-dev/include/linux/ $(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 $(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/user.h
endef endef
define Host/Prepare/post/ubicom32 define Host/Configure/post/ubicom32
$(CP) \ $(CP) \
$(HOST_BUILD_DIR)/arch/ubicom32/include/asm/elf.h \ $(HOST_BUILD_DIR)/arch/ubicom32/include/asm/elf.h \
$(HOST_BUILD_DIR)/arch/ubicom32/include/asm/user.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/ $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/
endef endef
define Host/Prepare/post/mips define Host/Configure/post/mips
$(call Host/Prepare/lzma) $(call Host/Configure/lzma)
endef endef
define Host/Prepare/post/mipsel define Host/Configure/post/mipsel
$(call Host/Prepare/lzma) $(call Host/Configure/lzma)
endef endef
define Host/Prepare define Host/Prepare
$(call Kernel/Prepare/Default) $(call Kernel/Prepare/Default)
ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux ln -sf linux-$(LINUX_VERSION) $(BUILD_DIR_TOOLCHAIN)/linux
$(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile $(SED) 's/@expr length/@-expr length/' $(HOST_BUILD_DIR)/Makefile
yes '' | $(KMAKE) oldconfig
$(call Host/Prepare/all)
$(call Host/Prepare/post/$(ARCH))
endef endef
define Host/Configure define Host/Configure
env
yes '' | $(KMAKE) oldconfig
$(call Host/Configure/all)
$(call Host/Configure/post/$(ARCH))
endef endef
define Host/Compile define Host/Compile