diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-08-19 12:49:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-08-19 12:49:51 +0000 |
| commit | f1f392ab5f9174a11c1cce71567316100187be39 (patch) | |
| tree | 3c5ffce597429d02d40c40f77b277034d4002ece /toolchain/kernel-headers/Makefile | |
| parent | e0456989091285381c7c2acc3a0fdd6c96f1175e (diff) | |
| download | upstream-f1f392ab5f9174a11c1cce71567316100187be39.tar.gz upstream-f1f392ab5f9174a11c1cce71567316100187be39.tar.bz2 upstream-f1f392ab5f9174a11c1cce71567316100187be39.zip | |
toolchain: fix the sysroot mess by getting rid of $(TOOLCHAIN_DIR)/usr and moving it back to $(TOOLCHAIN_DIR), this change makes the toolchain relocatable again, which should fix the SDK
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/kernel-headers/Makefile')
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index d2d12c71ae..614c405155 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -42,9 +42,9 @@ KMAKE := $(MAKE) -C $(HOST_BUILD_DIR) \ CONFIG_SHELL=$(BASH) define Host/Prepare/all - mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr + mkdir -p $(BUILD_DIR_TOOLCHAIN)/linux-dev $(KMAKE) \ - INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/" \ + INSTALL_HDR_PATH="$(BUILD_DIR_TOOLCHAIN)/linux-dev/" \ headers_install if [ -d $(HOST_BUILD_DIR)/arch/$(LINUX_KARCH)/include/asm ]; then \ mkdir -p $(HOST_BUILD_DIR)/include/asm-$(LINUX_KARCH); \ @@ -59,16 +59,16 @@ define Host/Prepare/lzma $(CP) \ $(HOST_BUILD_DIR)/include/asm-mips/asm.h \ $(HOST_BUILD_DIR)/include/asm-mips/regdef.h \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/ + $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/ endef define Host/Prepare/post/cris $(CP) \ $(HOST_BUILD_DIR)/include/linux/user.h \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/linux/ - ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch-v10/arch \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/arch - $(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/user.h + $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/linux/ + ln -snf $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/arch-v10/arch \ + $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/arch + $(SED) '/#include <asm\/page\.h>/d' $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/user.h endef define Host/Prepare/post/ubicom32 @@ -77,7 +77,7 @@ define Host/Prepare/post/ubicom32 $(HOST_BUILD_DIR)/arch/ubicom32/include/asm/user.h \ $(HOST_BUILD_DIR)/arch/ubicom32/include/asm/page.h \ $(HOST_BUILD_DIR)/arch/ubicom32/include/asm/page_offset.h \ - $(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include/asm/ + $(BUILD_DIR_TOOLCHAIN)/linux-dev/include/asm/ endef define Host/Prepare/post/mips |