X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f654420911cb81ddde3059deaa9988516eeb9eaf..be11e989ca09a64632f976654f69c655f8808675:/toolchain/kernel-headers/Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 0493e2aca..cf5a38429 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -32,6 +32,10 @@ ifeq ($(strip $(BOARD)),uml)
   LINUX_KARCH:=$(ARCH)
 endif
 
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
+  LINUX_HAS_HEADERS_INSTALL:=y
+endif
+
 KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
 	ARCH=$(LINUX_KARCH) \
 	KBUILD_HAVE_NLS=no \
@@ -50,7 +54,7 @@ define Build/Prepare/pre/powerpc
 	fi
 endef
 
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.18)),1)
+ifneq ($(LINUX_HAS_HEADERS_INSTALL),)
   define Build/Prepare/all
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr
 	$(KMAKE) \
@@ -78,12 +82,27 @@ define Build/Prepare/lzma
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
 endef
 
-# XXX: the following is needed to build final gcc on cris
+# XXX: the following are needed to build a cris toolchain
 define Build/Prepare/post/cris
+	$(CP) \
+		$(PKG_BUILD_DIR)/include/linux/user.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/
+	$(CP) \
+		$(PKG_BUILD_DIR)/include/asm-cris/elf.h \
+		$(PKG_BUILD_DIR)/include/asm-cris/page.h \
+		$(PKG_BUILD_DIR)/include/asm-cris/user.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/
 	mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch
 	$(CP) \
+		$(PKG_BUILD_DIR)/include/asm-cris/arch/elf.h \
+		$(PKG_BUILD_DIR)/include/asm-cris/arch/page.h \
 		$(PKG_BUILD_DIR)/include/asm-cris/arch/ptrace.h \
+		$(PKG_BUILD_DIR)/include/asm-cris/arch/user.h \
 		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/arch/
+	$(CP) \
+		$(PKG_BUILD_DIR)/include/asm-generic/memory_model.h \
+		$(PKG_BUILD_DIR)/include/asm-generic/page.h \
+		$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm-generic/
 endef
 
 define Build/Prepare/post/mips