[openfirmware] [commit] r2545 - in clients: emacs/arm lib/arm

[repository service]

Author: pgf
Date: Wed Sep 28 23:22:57 2011
New Revision: 2545
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2545

Log:
allow use of $CROSS to locate cross-compiler

default path to cross-compiler in /usr/local/arm is unchanged if
CROSS is unset.

Modified:
   clients/emacs/arm/Makefile
   clients/lib/arm/makefile

Modified: clients/emacs/arm/Makefile
==============================================================================
--- clients/emacs/arm/Makefile	Wed Sep 28 03:06:17 2011	(r2544)
+++ clients/emacs/arm/Makefile	Wed Sep 28 23:22:57 2011	(r2545)
@@ -6,10 +6,12 @@
 
 ifneq (arm, $(findstring arm,$(shell uname -p)))
   # Cross-compiler setup
-  TOOLPREFIX=/usr/local/arm/bin/arm-linux-
-  CC=$(TOOLPREFIX)gcc
-  LD=$(TOOLPREFIX)ld
-  STRIP=$(TOOLPREFIX)strip
+ifeq ($(CROSS),)
+    CROSS=/usr/local/arm/arm-linux/bin/
+endif
+  CC    := $(CROSS)gcc
+  LD    := $(CROSS)ld
+  STRIP := $(CROSS)strip
 else
   CC    := gcc
   STRIP := strip

Modified: clients/lib/arm/makefile
==============================================================================
--- clients/lib/arm/makefile	Wed Sep 28 03:06:17 2011	(r2544)
+++ clients/lib/arm/makefile	Wed Sep 28 23:22:57 2011	(r2545)
@@ -4,11 +4,11 @@
 # functions that conflict with gcc builtins
 
 ifneq (arm, $(findstring arm,$(shell uname -p)))
-  # Cross-compiler setup
-  ARCH  := /usr/local/arm
-  UTILS := $(ARCH)/arm-linux/bin
-  CC    := $(UTILS)/gcc
-  LD    := $(UTILS)/ld
+ifeq ($(CROSS),)
+    CROSS=/usr/local/arm/arm-linux/bin/
+endif
+  CC    := $(CROSS)gcc
+  LD    := $(CROSS)ld
 else
   CC    := gcc
 endif