diff options
| author | Peter Korsgaard | 2010-10-17 23:32:37 +0200 |
|---|---|---|
| committer | Peter Korsgaard | 2010-10-17 23:32:37 +0200 |
| commit | 891973f53805e35a4a14657f2c922ee7c5ff7cf7 (patch) | |
| tree | 7593f25ca0bf7419f8610a0cd524cc0dad650ddf | |
| parent | startup-notification: ensure cross-X11 headers/libs are used (diff) | |
| download | buildroot-891973f53805e35a4a14657f2c922ee7c5ff7cf7.tar.gz buildroot-891973f53805e35a4a14657f2c922ee7c5ff7cf7.tar.xz buildroot-891973f53805e35a4a14657f2c922ee7c5ff7cf7.zip | |
Makefile: move KERNEL_ARCH from kernel-headers to here
Closes #2707
It's not only for kernel headers, and the kernel headers .mk file
isn't included for crosstool-ng toolchain, which broke linux/u-boot/..
builds.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers.mk | 8 |
3 files changed, 9 insertions, 8 deletions
@@ -68,6 +68,7 @@ #2521: Can't compile sdl_mixer, mikmod.h can't be found #2563: [PATCH] cairo: Expose the configure option to disable some... #2581: libmms: Update to 0.6, and patch to work on architectures... + #2707: Can't compile linux kernel using buildroot + crosstool-ng 2010.08: Released August 31th, 2010: @@ -249,6 +249,14 @@ ifeq ($(ARCH),xtensa) ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name)) endif +KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \ + -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/parisc64/parisc/ \ + -e s/powerpc64/powerpc/ \ + -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ + -e s/sh.*/sh/) + ZCAT:=$(call qstrip,$(BR2_ZCAT)) BZCAT:=$(call qstrip,$(BR2_BZCAT)) TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 7b8989bbc..bb7ee3c40 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -13,14 +13,6 @@ LINUX_HEADERS_SITE:=127.0.0.1 LINUX_HEADERS_SOURCE:=unspecified-kernel-headers LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-libc-headers-null -KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \ - -e s/i.86/i386/ -e s/sun4u/sparc64/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/parisc64/parisc/ \ - -e s/powerpc64/powerpc/ \ - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/sh.*/sh/") - include toolchain/kernel-headers/kernel-headers-new.makefile $(DL_DIR)/$(LINUX_HEADERS_SOURCE): |