[PATCH] Explicitly use BUILD_CC and TARGET_CC

[Jeremy Kerr]

Currently, we override CC for build and target compiles:

$(BIN_TO_HEX): CC=$(BUILD_CC)

However, this breaks when a user does something like:

 make CC=host-arch-gcc

- since command-line parameter overrides all makefile variables, so
we end up using host-arch-gcc for *all* compiles, including those for
target and build.

This change explicitly uses BUILD_CC and TARGET_CC where necessary,
so that the CC variable isn't used for build and target compiles.

Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

---
 purgatory/Makefile |   16 +++++++++-------
 util/Makefile      |    6 +-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/purgatory/Makefile b/purgatory/Makefile
index ac58719..d7aec3a 100644
--- a/purgatory/Makefile
+++ b/purgatory/Makefile
@@ -42,27 +42,29 @@ purgatory/sha256.o: CFLAGS += -O0
 
 purgatory/sha256.o: $(srcdir)/util_lib/sha256.c
 	mkdir -p $(@D)
-	$(COMPILE.c) -o $@ $^
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -o $@ $^
 
-$(PURGATORY): CC=$(TARGET_CC)
-$(PURGATORY): CFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
+$(PURGATORY): TARGET_CFLAGS += $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
 		      -Os -fno-builtin -ffreestanding \
 		      -fno-zero-initialized-in-bss
 
-$(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
+$(PURGATORY): TARGET_CPPFLAGS += $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
 			-I$(srcdir)/purgatory/include \
 			-I$(srcdir)/purgatory/arch/$(ARCH)/include \
 			-I$(srcdir)/util_lib/include \
 			-I$(shell $(CC) -print-file-name=include)
-$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
+
+$(PURGATORY): TARGET_LDFLAGS += $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
 			--no-undefined -nostartfiles -nostdlib -nodefaultlibs \
 			-e purgatory_start -r
 
 $(PURGATORY): $(PURGATORY_OBJS)
 	$(MKDIR) -p $(@D)
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(TARGET_CC) $(TARGET_LDFLAGS) -o $@ $^
 
-#	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
+$(PURGATORY_OBJS): %.o: %.c
+	$(MKDIR) -p $(@D)
+	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -o $@ $^
 
 echo::
 	@echo "PURGATORY_SRCS $(PURGATORY_SRCS)"
diff --git a/util/Makefile b/util/Makefile
index 948ee63..9c005d5 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -2,11 +2,7 @@ BIN_TO_HEX:= bin/bin-to-hex
 
 $(BIN_TO_HEX): $(srcdir)/util/bin-to-hex.c
 	@$(MKDIR) -p $(@D)
-	$(LINK.o) $(CFLAGS) -o $@ $^
-
-$(BIN_TO_HEX): CC=$(BUILD_CC)
-$(BIN_TO_HEX): CFLAGS=$(BUILD_CFLAGS)
-$(BIN_TO_HEX): LDFLAGS=
+	$(BUILD_CC) $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -o $@ $^
 
 dist += util/Makefile util/bin-to-hex.c
 clean += util/bin-to-hex.o $(BIN_TO_HEX)