Ok, taking this split of compiler options used only for compiles a step further....The idea is that when the user passes CFLAGS to configure, those flags are to be used basically anywhere that that CC is. COMPILE_FLAGS is set in configure to contain the compiler flags that cannot be used while linking (e.g. -include on BSD/OS). In config.mk, I moved all of the variables that used to compose CFLAGS into COMPILE_CFLAGS so that CFLAGS only contains the values from running configure.

Removed unused NOMD_CFLAGS & MDUPDATE_FLAGS.

config/autoconf.mk.in

@@ -102,11 +102,12 @@ MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@
 
 CROSS_COMPILE   = @CROSS_COMPILE@
 
-# Should the extra CFLAGS only be added in Makefile.ins that need them? 
 OS_CFLAGS	= @CFLAGS@
 OS_CXXFLAGS	= @CXXFLAGS@
+OS_LDFLAGS	= @LDFLAGS@
 
-OS_LDFLAGS      = @LDFLAGS@
+OS_COMPILE_CFLAGS = @COMPILE_CFLAGS@
+OS_COMPILE_CXXFLAGS = @COMPILE_CXXFLAGS@
 
 OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
 OS_LIBS		= @LIBS@

config/config.mk

@@ -260,7 +260,7 @@ endif
 # be put in the library directories where it belongs so that it can
 # get exported to dist properly.
 #
-INCLUDES	= $(LOCAL_INCLUDES) -I$(PUBLIC) -I$(DIST)/include -I$(XPDIST)/include -I$(topsrcdir)/include $(OS_INCLUDES) $(G++INCLUDES)
+INCLUDES	= $(LOCAL_INCLUDES) -I$(PUBLIC) -I$(DIST)/include -I$(XPDIST)/include -I$(topsrcdir)/include $(OS_INCLUDES)
 
 LIBNT		= $(DIST)/lib/libnt.$(LIB_SUFFIX)
 LIBAWT		= $(DIST)/lib/libawt.$(LIB_SUFFIX)
@@ -288,13 +288,11 @@ LIBNSJAVA	= $(DIST)/lib/nsjava32.$(LIB_SUFFIX)
 endif
 endif
 
-CFLAGS		= $(OS_CFLAGS) $(MDUPDATE_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROF_FLAGS)
-CXXFLAGS	= $(OS_CXXFLAGS) $(MDUPDATE_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROF_FLAGS)
-COMPILE_CFLAGS	= $(CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS)
-COMPILE_CXXFLAGS = $(CXXFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS)
+CFLAGS		= $(OS_CFLAGS)
+CXXFLAGS	= $(OS_CXXFLAGS)
 
-NOMD_CFLAGS	= $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-NOMD_CXXFLAGS	= $(OS_CXXFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
+COMPILE_CFLAGS	= $(CFLAGS) $(OS_COMPILE_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROF_FLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS)
+COMPILE_CXXFLAGS = $(CXXFLAGS) $(OS_COMPILE_CXXFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROF_FLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS)
 
 LDFLAGS		= $(OS_LDFLAGS)
 

configure

@@ -10195,8 +10195,6 @@ LDFLAGS=`echo \
 CFLAGS=`echo \
 	$_WARNINGS_CFLAGS \
 	$_GPROF_CFLAGS \
-	$_DEPEND_CFLAGS \
-	$_DEFINES_CFLAGS \
 	$CFLAGS`
 
 CXXFLAGS=`echo \
@@ -10204,10 +10202,20 @@ CXXFLAGS=`echo \
 	$_MOZ_EXCEPTIONS_FLAGS \
 	$_WARNINGS_CXXFLAGS \
 	$_GPROF_CFLAGS \
-	$_DEPEND_CFLAGS \
-	$_DEFINES_CXXFLAGS \
 	$CXXFLAGS`
 
+COMPILE_CFLAGS=`echo \
+    $_DEFINES_CFLAGS \
+	$_DEPEND_CFLAGS \
+    $COMPILE_CFLAGS`
+
+COMPILE_CXXFLAGS=`echo \
+    $_DEFINES_CXXFLAGS \
+	$_DEPEND_CFLAGS \
+    $COMPILE_CXXFLAGS`
+
+
+
 
 
 
@@ -10723,6 +10731,8 @@ s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
 s%@NSPR_LIBS@%$NSPR_LIBS%g
 s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g
 s%@USE_NSPR_AUTOCONF@%$USE_NSPR_AUTOCONF%g
+s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g
+s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g
 s%@CROSS_COMPILE@%$CROSS_COMPILE%g
 s%@HOST_CFLAGS@%$HOST_CFLAGS%g
 s%@HOST_CXXFLAGS@%$HOST_CXXFLAGS%g

configure.in

@@ -3032,8 +3032,6 @@ dnl Echo the CFLAGS to remove extra whitespace.
 CFLAGS=`echo \
 	$_WARNINGS_CFLAGS \
 	$_GPROF_CFLAGS \
-	$_DEPEND_CFLAGS \
-	$_DEFINES_CFLAGS \
 	$CFLAGS`
 
 CXXFLAGS=`echo \
@@ -3041,10 +3039,18 @@ CXXFLAGS=`echo \
 	$_MOZ_EXCEPTIONS_FLAGS \
 	$_WARNINGS_CXXFLAGS \
 	$_GPROF_CFLAGS \
-	$_DEPEND_CFLAGS \
-	$_DEFINES_CXXFLAGS \
 	$CXXFLAGS`
 
+COMPILE_CFLAGS=`echo \
+    $_DEFINES_CFLAGS \
+	$_DEPEND_CFLAGS \
+    $COMPILE_CFLAGS`
+
+COMPILE_CXXFLAGS=`echo \
+    $_DEFINES_CXXFLAGS \
+	$_DEPEND_CFLAGS \
+    $COMPILE_CXXFLAGS`
+
 dnl 
 dnl It is perfectly legal to build with both -O and -g even though
 dnl some compilers/platforms might not support this.
@@ -3079,6 +3085,8 @@ AC_SUBST(USE_NSPR_AUTOCONF)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
+AC_SUBST(COMPILE_CFLAGS)
+AC_SUBST(COMPILE_CXXFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(CROSS_COMPILE)

modules/libreg/src/Makefile.in

@@ -55,8 +55,8 @@ include $(topsrcdir)/config/rules.mk
 
 R_%.o: %.c
 ifeq ($(OS_ARCH), OS2)
-	$(CC) -Fo$@ -c $(CFLAGS) -DSTANDALONE_REGISTRY $<
+	$(CC) -Fo$@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
 else
-	$(CC) -o $@ -c $(CFLAGS) -DSTANDALONE_REGISTRY $<
+	$(CC) -o $@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
 endif