diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 20:57:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 20:57:56 -0400 |
| commit | 9a459f6812fc26e0eb24bbe9c388000e23f67f6b (patch) | |
| tree | c79cf75032eb432a5e9bc7c4b366267f32843416 /Makefile | |
| parent | 090b710e8a0b7fe6f4752c5a439261f955075ebc (diff) | |
| parent | 55c640c3abff301eed5ee11c34a40bfe043c8c2d (diff) | |
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/ \ | |||
| 189 | # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile | 189 | # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile |
| 190 | export KBUILD_BUILDHOST := $(SUBARCH) | 190 | export KBUILD_BUILDHOST := $(SUBARCH) |
| 191 | ARCH ?= $(SUBARCH) | 191 | ARCH ?= $(SUBARCH) |
| 192 | CROSS_COMPILE ?= | ||
| 193 | CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) | 192 | CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) |
| 194 | 193 | ||
| 195 | # Architecture as present in compile.h | 194 | # Architecture as present in compile.h |