From 211d41948a9f5bb4e6f322cb8639e01439e13abf Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 28 Mar 2012 13:49:22 -0700
Subject: [PATCH] Conditionalize CC / CXX / CPP to permit using other gcc
 versions.

---
 mk/platform.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mk/platform.mk b/mk/platform.mk
index c35738a51fa4..c032c04c1e2a 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -204,9 +204,9 @@ endif
 
 CFG_INFO := $(info cfg: using $(CFG_C_COMPILER))
 ifeq ($(CFG_C_COMPILER),clang)
-  CC=clang
-  CXX=clang++
-  CPP=cpp
+  CC ?= clang
+  CXX ?= clang++
+  CPP ?= cpp
   CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
   CFG_GCCISH_LINK_FLAGS += -g
   CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
@@ -229,9 +229,9 @@ ifeq ($(CFG_C_COMPILER),clang)
     $(eval $(call CFG_MAKE_CC,$(target))))
 else
 ifeq ($(CFG_C_COMPILER),gcc)
-  CC=gcc
-  CXX=g++
-  CPP=cpp
+  CC ?= gcc
+  CXX ?= g++
+  CPP ?= cpp
   CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
   CFG_GCCISH_LINK_FLAGS += -g
   CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \