diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 02:57:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 02:57:56 +0200 |
commit | 9a459f6812fc26e0eb24bbe9c388000e23f67f6b (patch) | |
tree | c79cf75032eb432a5e9bc7c4b366267f32843416 /Makefile | |
parent | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare... (diff) | |
parent | setlocalversion: fix version for untaged nontip mercurial revs (diff) | |
download | linux-9a459f6812fc26e0eb24bbe9c388000e23f67f6b.tar.xz linux-9a459f6812fc26e0eb24bbe9c388000e23f67f6b.zip |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
setlocalversion: fix version for untaged nontip mercurial revs
Fix CONFIG_CROSS_COMPILE issue in .config
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -189,7 +189,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile export KBUILD_BUILDHOST := $(SUBARCH) ARCH ?= $(SUBARCH) -CROSS_COMPILE ?= CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) # Architecture as present in compile.h |