Allow CC & CCC to be overridden in coreconf.

Bug #107976

9 files changed, 19 insertions, 15 deletions

diff --git a/security/coreconf/AIX.mk b/security/coreconf/AIX.mk
index ce4849c2d..a42d5481c 100644
--- a/security/coreconf/AIX.mk
+++ b/security/coreconf/AIX.mk
@@ -65,7 +65,7 @@ CPU_ARCH	= rs6000
 RANLIB		= ranlib
 
 OS_CFLAGS	= -DAIX -DSYSV
-ifeq ($(CC),xlC_r)
+ifeq ($(firstword $(basename $(CC))),xlC_r)
 	OS_CFLAGS += -qarch=com
 endif
 
diff --git a/security/coreconf/HP-UXB.11.mk b/security/coreconf/HP-UXB.11.mk
index 5b489014f..e09d7fb5e 100644
--- a/security/coreconf/HP-UXB.11.mk
+++ b/security/coreconf/HP-UXB.11.mk
@@ -39,7 +39,8 @@ USE_HYBRID = 1
 endif
 
 ifndef NS_USE_GCC
-    CCC                 = /opt/aCC/bin/aCC -ext
+    CCC                 = /opt/aCC/bin/aCC
+    OS_CXXFLAGS         += -ext
     ifeq ($(USE_64), 1)
 	ifeq ($(OS_TEST), ia64)
 	    OS_CFLAGS	+= -Aa +e +p +DD64
diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index 4b80a7f81..11722734c 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -124,7 +124,8 @@ ASFLAGS = -Od
 else
 ASFLAGS = +Od
 endif
-CCC			= icc -q -DXP_OS2 -DOS2=4 -N10
+CCC			= icc
+OS_CXXFLAGS		+= -q -DXP_OS2 -DOS2=4 -N10
 LINK			= -ilink
 AR		= -ilib /NOL /NOI /O:$(subst /,\\,$@)
 # Keep AR_FLAGS blank so that we do not have to change rules.mk
diff --git a/security/coreconf/SCO_SV3.2.mk b/security/coreconf/SCO_SV3.2.mk
index 4683783ee..ce23dc9ed 100644
--- a/security/coreconf/SCO_SV3.2.mk
+++ b/security/coreconf/SCO_SV3.2.mk
@@ -40,7 +40,7 @@ DEFAULT_COMPILER = cc
 CC         = cc
 OS_CFLAGS += -b elf -KPIC
 CCC        = g++
-CCC       += -b elf -DPRFSTREAMS_BROKEN -I/usr/local/lib/g++-include
+OS_CXXFLAGS += -b elf -DPRFSTREAMS_BROKEN -I/usr/local/lib/g++-include
 # CCC      = $(CORE_DEPTH)/build/hcpp
 # CCC     += +.cpp +w
 RANLIB     = /bin/true
diff --git a/security/coreconf/SunOS5.4_i86pc.mk b/security/coreconf/SunOS5.4_i86pc.mk
index 35dfdb86a..64231d387 100644
--- a/security/coreconf/SunOS5.4_i86pc.mk
+++ b/security/coreconf/SunOS5.4_i86pc.mk
@@ -41,7 +41,7 @@ ifdef NS_USE_GCC
 	CC		= gcc
 	OS_CFLAGS	+= -Wall -Wno-format
 	CCC		= g++
-	CCC		+= -Wall -Wno-format
+	OS_CXXFLAGS	+= -Wall -Wno-format
 	ASFLAGS		+= -x assembler-with-cpp
 	OS_CFLAGS	+= $(NOMD_OS_CFLAGS)
 	ifdef USE_MDUPDATE
diff --git a/security/coreconf/SunOS5.mk b/security/coreconf/SunOS5.mk
index a0179bc5e..f2d04e310 100644
--- a/security/coreconf/SunOS5.mk
+++ b/security/coreconf/SunOS5.mk
@@ -99,7 +99,7 @@ ifdef NS_USE_GCC
 	CC         = gcc
 	OS_CFLAGS += -Wall -Wno-format
 	CCC        = g++
-	CCC       += -Wall -Wno-format
+	OS_CXXFLAGS += -Wall -Wno-format
 	ASFLAGS	  += -x assembler-with-cpp
 	OS_CFLAGS += $(NOMD_OS_CFLAGS)
 	ifdef USE_MDUPDATE
diff --git a/security/coreconf/command.mk b/security/coreconf/command.mk
index 96cddff68..591c63814 100644
--- a/security/coreconf/command.mk
+++ b/security/coreconf/command.mk
@@ -44,6 +44,8 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
 NFSPWD        = $(NSINSTALL_DIR)/nfspwd
 CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
 		$(XCFLAGS)
+CXXFLAGS     += $(OPTIMIZER) $(OS_CXXFLAGS) $(OS_CFLAGS) $(XP_DEFINE) \
+                $(DEFINES) $(INCLUDES) $(XCFLAGS)
 RANLIB        = echo
 TAR           = /bin/tar
 #
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk
index f287f620e..83e6c73a5 100644
--- a/security/coreconf/rules.mk
+++ b/security/coreconf/rules.mk
@@ -435,9 +435,9 @@ $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S
 $(OBJDIR)/$(PROG_PREFIX)%: %.cpp
 	@$(MAKE_OBJDIR)
 ifdef USE_NT_C_SYNTAX
-	$(CCC) -Fo$@ -c $(CFLAGS) $<
+	$(CCC) -Fo$@ -c $(CXXFLAGS) $<
 else
-	$(CCC) -o $@ -c $(CFLAGS) $<
+	$(CCC) -o $@ -c $(CXXFLAGS) $<
 endif
 
 #
@@ -445,24 +445,24 @@ endif
 #
 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.cc
 	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ -c $(CFLAGS) $<
+	$(CCC) -o $@ -c $(CXXFLAGS) $<
 
 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.cpp
 	@$(MAKE_OBJDIR)
 ifdef STRICT_CPLUSPLUS_SUFFIX
 	echo "#line 1 \"$<\"" | cat - $< > $(OBJDIR)/t_$*.cc
-	$(CCC) -o $@ -c $(CFLAGS) $(OBJDIR)/t_$*.cc
+	$(CCC) -o $@ -c $(CXXFLAGS) $(OBJDIR)/t_$*.cc
 	rm -f $(OBJDIR)/t_$*.cc
 else
 ifdef USE_NT_C_SYNTAX
-	$(CCC) -Fo$@ -c $(CFLAGS) $<
+	$(CCC) -Fo$@ -c $(CXXFLAGS) $<
 else
-	$(CCC) -o $@ -c $(CFLAGS) $<
+	$(CCC) -o $@ -c $(CXXFLAGS) $<
 endif
 endif #STRICT_CPLUSPLUS_SUFFIX
 
 %.i: %.cpp
-	$(CCC) -C -E $(CFLAGS) $< > $*.i
+	$(CCC) -C -E $(CXXFLAGS) $< > $*.i
 
 %.i: %.c
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk
index 8a9385c9a..ce96dec63 100644
--- a/security/coreconf/ruleset.mk
+++ b/security/coreconf/ruleset.mk
@@ -81,14 +81,14 @@
 #
 
 ifndef COMPILER_TAG
-    ifneq ($(DEFAULT_COMPILER), $(CC))
+    ifneq ($(DEFAULT_COMPILER), $(firstword $(basename $(CC))))
 #
 # Temporary define for the Client; to be removed when binary release is used
 #
 	ifdef MOZILLA_CLIENT
 	    COMPILER_TAG =
 	else
-	    COMPILER_TAG = _$(CC)
+	    COMPILER_TAG = _$(firstword $(basename $(CC)))
 	endif
     else
 	COMPILER_TAG =