summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 02:57:56 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 02:57:56 +0200
commit9a459f6812fc26e0eb24bbe9c388000e23f67f6b (patch)
treec79cf75032eb432a5e9bc7c4b366267f32843416 /Makefile
parentMerge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare... (diff)
parentsetlocalversion: fix version for untaged nontip mercurial revs (diff)
downloadlinux-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--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7431c283f15b..788111d21559 100644
--- a/Makefile
+++ b/Makefile
@@ -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