From 5bd7e4f373a263d3e5e216761cb2faf8c6a40701 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 21 Dec 2009 16:24:06 -0800 Subject: [PATCH] --- yaml --- r: 199491 b: refs/heads/master c: 84336466011c589b6af554f2f2f1fcfa1a5c1437 h: refs/heads/master i: 199489: f3c206134d53b98b93b0dd22869fe4ce18368364 199487: 6557b95d3d6e20ea8297bac7981437bfdc8f96ae v: v3 --- [refs] | 2 +- trunk/Makefile | 3 +++ trunk/init/Kconfig | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ace158b2e8d2..d50ff27550d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b024242e8a4e9679fa327ea03958b89f89096c9 +refs/heads/master: 84336466011c589b6af554f2f2f1fcfa1a5c1437 diff --git a/trunk/Makefile b/trunk/Makefile index 394aec712c7d..f9dc25cd9b2e 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -183,11 +183,14 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # CROSS_COMPILE can be set on the command line # make CROSS_COMPILE=ia64-linux- # Alternatively CROSS_COMPILE can be set in the environment. +# A third alternative is to store a setting in .config so that plain +# "make" in the configured kernel build directory always uses that. # Default value for CROSS_COMPILE is not to prefix executables # 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 UTS_MACHINE := $(ARCH) diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index d95ca7cd5d45..313506d8be6e 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -76,6 +76,14 @@ config INIT_ENV_ARG_LIMIT variables passed to init from the kernel command line. +config CROSS_COMPILE + string "Cross-compiler tool prefix" + help + Same as running 'make CROSS_COMPILE=prefix-' but stored for + default make runs in this kernel build directory. You don't + need to set this unless you want the configured kernel build + directory to select the cross-compiler automatically. + config LOCALVERSION string "Local version - append to kernel release" help