[U-Boot] [PATCH 2/2] tools: Use override when changing CC, CFLAGS, etc.

[Scott Wood]

If the user has specified a CC or similar on the command line, that is the
cross compiler, not the host compiler.  Override is needed to keep these
assignments from being ignored in that case.

Signed-off-by: Scott Wood <scottwood at freescale.com>
---
 tools/Makefile     |   10 +++++-----
 tools/gdb/Makefile |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 2a9a9fd..6bf3fde 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -139,21 +139,21 @@ LIBFDT_OBJS	:= $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
 # Use native tools and options
 # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
 #
-CPPFLAGS   = -idirafter $(SRCTREE)/include \
+override CPPFLAGS = -idirafter $(SRCTREE)/include \
 		-idirafter $(OBJTREE)/include2 \
 		-idirafter $(OBJTREE)/include \
 	        -I $(SRCTREE)/libfdt \
 		-I $(SRCTREE)/tools \
 		-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \
 		-D__KERNEL_STRICT_NAMES
-CFLAGS     = $(HOSTCFLAGS) $(CPPFLAGS) -O
+override CFLAGS = $(HOSTCFLAGS) $(CPPFLAGS) -O
 
 # No -pedantic switch to avoid libfdt compilation warnings
 FIT_CFLAGS = -Wall $(CPPFLAGS) -O
 
-AFLAGS	   = -D__ASSEMBLY__ $(CPPFLAGS)
-CC	   = $(HOSTCC)
-STRIP	   = $(HOSTSTRIP)
+override AFLAGS = -D__ASSEMBLY__ $(CPPFLAGS)
+override CC = $(HOSTCC)
+override STRIP = $(HOSTSTRIP)
 MAKEDEPEND = makedepend
 
 all:	$(obj).depend $(BINS) $(LOGO-y) subdirs
diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile
index 0a5687d..dca97f4 100644
--- a/tools/gdb/Makefile
+++ b/tools/gdb/Makefile
@@ -37,9 +37,9 @@ BINS	:= $(addprefix $(obj),$(BINS))
 #
 # Use native tools and options
 #
-CPPFLAGS   = -I$(BFD_ROOT_DIR)/include
-CFLAGS     = $(HOSTCFLAGS) -O $(CPPFLAGS)
-CC	   = $(HOSTCC)
+override CPPFLAGS = -I$(BFD_ROOT_DIR)/include
+override CFLAGS = $(HOSTCFLAGS) -O $(CPPFLAGS)
+override CC = $(HOSTCC)
 MAKEDEPEND = makedepend
 
 HOSTOS := $(shell uname -s | sed -e 's/\([Cc][Yy][Gg][Ww][Ii][Nn]\).*/cygwin/')
-- 
1.6.4.4