[PATCH] h8300, score: fix CROSS_COMPILE setting in arch/xxx/Makefile

[Jiang Liu]

Makefiles for h8300 and score architectures unconditionally set
CROSS_COMPILE to a default value, which breaks following cross
compilation command:
ARCH=h8300 CROSS_COMPILE=/ws/tool/h8300-elf/bin/h8300-elf- make arch/h8300/mm/init.o
make: h8300-elf-gcc: Command not found
make: h8300-elf-gcc: Command not found
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  CC      kernel/bounds.s
/bin/sh: 1: h8300-elf-gcc: not found
make[1]: *** [kernel/bounds.s] Error 127
make: *** [prepare0] Error 2

So only set CROSS_COMPILE to the default value if it's has been set yet.

Also fix a typo in arch/h8300/Makefile to change "CROSS-COMPILE" to
"CROSS_COMPILE".

Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxx>
Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Cc: Chen Liqin <liqin.chen@xxxxxxxxxxxxx>
Cc: Lennox Wu <lennox.wu@xxxxxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
 arch/h8300/Makefile |    6 ++++--
 arch/score/Makefile |    4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index a556447..62a4d08 100644
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -38,8 +38,10 @@ KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\"
 KBUILD_AFLAGS += -DPLATFORM=$(PLATFORM) -DMODEL=$(MODEL) $(cflags-y)
 LDFLAGS += $(ldflags-y)
 
-CROSS_COMPILE = h8300-elf-
-LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
+ifeq ($(CROSS_COMPILE),)
+	CROSS_COMPILE := h8300-elf-
+endif
+LIBGCC := $(shell $(CROSS_COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
 head-y := arch/$(ARCH)/platform/$(PLATFORM)/$(BOARD)/crt0_$(MODEL).o
 
diff --git a/arch/score/Makefile b/arch/score/Makefile
index 974aefe..70973bb 100644
--- a/arch/score/Makefile
+++ b/arch/score/Makefile
@@ -7,7 +7,9 @@
 #
 
 KBUILD_DEFCONFIG := spct6600_defconfig
-CROSS_COMPILE := score-linux-
+ifeq ($(CROSS_COMPILE),)
+	CROSS_COMPILE := score-linux-
+endif
 
 #
 # CPU-dependent compiler/assembler options for optimization.
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/