From fbd5f2edec83a654b4e07c2cd0f0b748a474c817 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com"
 <wtc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 11 Feb 2003 01:15:36 +0000
Subject: [PATCH] Bug 107976: allow CC to be overridden (with the full pathname
 of the C compiler) on the make command line. Modified files: AIX.mk
 ruleset.mk

git-svn-id: svn://10.0.0.236/trunk@137644 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/coreconf/AIX.mk     | 2 +-
 mozilla/security/coreconf/ruleset.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/security/coreconf/AIX.mk b/mozilla/security/coreconf/AIX.mk
index ce4849c2da5..4e9429c1a84 100644
--- a/mozilla/security/coreconf/AIX.mk
+++ b/mozilla/security/coreconf/AIX.mk
@@ -65,7 +65,7 @@ CPU_ARCH	= rs6000
 RANLIB		= ranlib
 
 OS_CFLAGS	= -DAIX -DSYSV
-ifeq ($(CC),xlC_r)
+ifndef NS_USE_GCC
 	OS_CFLAGS += -qarch=com
 endif
 
diff --git a/mozilla/security/coreconf/ruleset.mk b/mozilla/security/coreconf/ruleset.mk
index 8a9385c9a4a..ab5413ab4c4 100644
--- a/mozilla/security/coreconf/ruleset.mk
+++ b/mozilla/security/coreconf/ruleset.mk
@@ -81,14 +81,14 @@
 #
 
 ifndef COMPILER_TAG
-    ifneq ($(DEFAULT_COMPILER), $(CC))
+    ifneq ($(DEFAULT_COMPILER), $(notdir $(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 = _$(notdir $(CC))
 	endif
     else
 	COMPILER_TAG =