aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2012-05-12 22:39:08 +0200
committerChris Zankel <chris@zankel.net>2012-10-04 12:16:20 -0700
commit70cefe765433529fc894fd1995a1d5883cb33e05 (patch)
tree0b14a9b513805c8b5a3611c2862e96155ae970e3
parentxtensa: drop CONFIG_EMBEDDED_RAMDISK (diff)
downloadlinux-dev-70cefe765433529fc894fd1995a1d5883cb33e05.tar.xz
linux-dev-70cefe765433529fc894fd1995a1d5883cb33e05.zip
xtensa: Setup CROSS_COMPILE at the top
CROSS_COMPILE must be setup before using e.g. cc-option (and a few other as-*, cc-*, ld-* macros), else they will check against the wrong compiler when cross-compiling, and may invoke the cross compiler with wrong or suboptimal compiler options. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Chris Zankel <chris@zankel.net>
-rw-r--r--arch/xtensa/Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 735916b3daee..bb5ba61723f7 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -21,6 +21,18 @@ variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM) := custom
VARIANT = $(variant-y)
export VARIANT
+# Test for cross compiling
+
+ifneq ($(VARIANT),)
+ COMPILE_ARCH = $(shell uname -m)
+
+ ifneq ($(COMPILE_ARCH), xtensa)
+ ifndef CROSS_COMPILE
+ CROSS_COMPILE = xtensa_$(VARIANT)-
+ endif
+ endif
+endif
+
# Platform configuration
platform-$(CONFIG_XTENSA_PLATFORM_XT2000) := xt2000
@@ -48,18 +60,6 @@ endif
KBUILD_DEFCONFIG := iss_defconfig
-# Test for cross compiling
-
-ifneq ($(VARIANT),)
- COMPILE_ARCH = $(shell uname -m)
-
- ifneq ($(COMPILE_ARCH), xtensa)
- ifndef CROSS_COMPILE
- CROSS_COMPILE = xtensa_$(VARIANT)-
- endif
- endif
-endif
-
# Only build variant and/or platform if it includes a Makefile
buildvar := $(shell test -e $(srctree)/arch/xtensa/variants/$(VARIANT)/Makefile && echo arch/xtensa/variants/$(VARIANT)/)