summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <jbottomley@parallels.com>2012-02-27 21:41:05 +0000
committerJames Bottomley <JBottomley@Parallels.com>2012-02-28 09:39:28 -0600
commitaabb70dc23799e09d69d528756471d854f993136 (patch)
tree9acddbd3a5cb96339b0e01e9ae9f0144b720f7a6
parent650275dbfb2f4c12bc91420ad5a99f955eabec98 (diff)
downloadlinux-aabb70dc23799e09d69d528756471d854f993136.tar.bz2
[PARISC] don't unconditionally override CROSS_COMPILE for 64 bit.
The user may wish to set their own value (for real cross compiles). Since the top level Makefile initialises CROSS_COMPILE to empty by default, we must check it for being empty (rather than for being defined) before we override. Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--arch/parisc/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 55cca1dac431..19ab7b2ea1cd 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -31,7 +31,11 @@ ifdef CONFIG_64BIT
UTS_MACHINE := parisc64
CHECKFLAGS += -D__LP64__=1 -m64
WIDTH := 64
+
+# FIXME: if no default set, should really try to locate dynamically
+ifeq ($(CROSS_COMPILE),)
CROSS_COMPILE := hppa64-linux-gnu-
+endif
else # 32-bit
WIDTH :=
endif