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 =