12 files changed, 30 insertions, 19 deletions

diff --git a/base/expat.mak b/base/expat.mak
index 08db2a1d8..aa6d0e231 100644
--- a/base/expat.mak
+++ b/base/expat.mak
@@ -31,8 +31,8 @@ EXPATGEN=$(EXPATGENDIR)$(D)
 EXPATOBJ=$(EXPATOBJDIR)$(D)
 EXPATO_=$(O_)$(EXPATOBJ)
 
-EXPATCC=$(CC) $(CFLAGS) $(I_)$(EXPATSRC)lib$(_I) \
-$(D_)XML_POOR_ENTROPY$(_D) $(EXPAT_CFLAGS)
+EXPATCC=$(CC) $(I_)$(EXPATSRC)lib$(_I) \
+$(D_)XML_POOR_ENTROPY$(_D) $(EXPAT_CFLAGS) $(CCFLAGS)
 
 expat.clean : expat.config-clean expat.clean-not-config-clean
 
diff --git a/base/freetype.mak b/base/freetype.mak
index 20b0acf98..a281ae15a 100644
--- a/base/freetype.mak
+++ b/base/freetype.mak
@@ -34,7 +34,9 @@ FTO_=$(O_)$(FTOBJ)
 # we must define FT2_BUILD_LIBRARY to get internal declarations
 # If GS is using the system zlib, freetype should also do so,
 # FT_CONFIG_SYSTEM_ZLIB is set by the top makefile.
-FTCC=$(CC_) $(I_)$(FTGEN)$(_I) $(I_)$(FTSRCDIR)$(D)include$(_I) $(D_)FT_CONFIG_OPTIONS_H=\"$(FTCONFH)\"$(_D) $(D_)FT2_BUILD_LIBRARY$(_D) $(D_)DARWIN_NO_CARBON$(_D) $(FT_CONFIG_SYSTEM_ZLIB)
+FTCC=$(CC) $(I_)$(FTGEN)$(_I) $(I_)$(FTSRCDIR)$(D)include$(_I) \
+     $(D_)FT_CONFIG_OPTIONS_H=\"$(FTCONFH)\"$(_D) $(D_)FT2_BUILD_LIBRARY$(_D) \
+     $(D_)DARWIN_NO_CARBON$(_D) $(FT_CONFIG_SYSTEM_ZLIB) $(CCFLAGS)
 
 # Define the name of this makefile.
 FT_MAK=$(GLSRC)freetype.mak $(TOP_MAKEFILES)
diff --git a/base/ijs.mak b/base/ijs.mak
index ccbad4c9c..bb1292261 100644
--- a/base/ijs.mak
+++ b/base/ijs.mak
@@ -37,7 +37,7 @@ IJSO_=$(O_)$(IJSOBJ)
 # as are IJSGENDIR and IJSOBJDIR above.
 IJS_INCL=$(I_)$(IJSI_)$(_I)
 IJS_CCFLAGS=$(IJS_INCL) $(IJSF_)
-IJS_CC=$(CC_) $(IJS_CCFLAGS)
+IJS_CC=$(CC) $(IJS_CCFLAGS) $(CCFLAGS)
 
 # Define the name of this makefile.
 IJS_MAK=$(GLSRC)ijs.mak $(TOP_MAKEFILES)
diff --git a/base/jbig2.mak b/base/jbig2.mak
index f0f18b459..3b8d1f4ba 100644
--- a/base/jbig2.mak
+++ b/base/jbig2.mak
@@ -93,7 +93,7 @@ jbig2.config-clean :
 
 JBIG2DEP=$(AK)
 
-JBIG2_CC=$(CC_) $(CFLAGS) $(I_)$(JBIG2GENDIR) $(II)$(JB2I_)$(_I) $(JB2CF_) -DJBIG_EXTERNAL_MEMENTO_H=\"../base/memento.h\"
+JBIG2_CC=$(CC) $(I_)$(JBIG2GENDIR) $(II)$(JB2I_)$(_I) $(JB2CF_) -DJBIG_EXTERNAL_MEMENTO_H=\"../base/memento.h\" $(CCFLAGS)
 JBIG2O_=$(O_)$(JBIG2OBJ)
 
 # switch in the version of libjbig2.dev we're actually using
diff --git a/base/jpeg.mak b/base/jpeg.mak
index c1929e63e..070449f83 100644
--- a/base/jpeg.mak
+++ b/base/jpeg.mak
@@ -107,7 +107,7 @@ jpeg.config-clean :
 
 # JI_ and JF_ are defined in gs.mak.
 # See below for why we need to include GLGENDIR here.
-JCC=$(CC_) $(I_)$(GLGENDIR) $(II)$(JI_)$(_I) $(JF_)
+JCC=$(CC) $(I_)$(GLGENDIR) $(II)$(JI_)$(_I) $(JF_) $(CCFLAGS)
 
 # We need our own version of jconfig.h, and our own "wrapper" for
 # jmorecfg.h.
diff --git a/base/jpegxr.mak b/base/jpegxr.mak
index daa5f62f1..a771ebaae 100644
--- a/base/jpegxr.mak
+++ b/base/jpegxr.mak
@@ -31,7 +31,7 @@ JPEGXR_GEN=$(JPEGXR_GENDIR)$(D)
 JPEGXR_OBJ=$(JPEGXR_OBJDIR)$(D)
 JPEGXR_O_=$(O_)$(JPEGXR_OBJ)
 
-JPEGXR_CC=$(CC_) $(JPEGXR_CFLAGS) $(D_)JXR_DLL_EXPORTS=1$(_D) $(D_)NDEBUG$(_D)
+JPEGXR_CC=$(CC) $(JPEGXR_CFLAGS) $(D_)JXR_DLL_EXPORTS=1$(_D) $(D_)NDEBUG$(_D) $(CCFLAGS)
 
 jpegxr.clean : jpegxr.config-clean jpegxr.clean-not-config-clean
 
diff --git a/base/lib.mak b/base/lib.mak
index 59f64b0d4..62105ccd4 100644
--- a/base/lib.mak
+++ b/base/lib.mak
@@ -44,14 +44,17 @@ GLINCLUDES=$(I_)$(GLI_)$(_I)
 GLCCFLAGS=$(GLINCLUDES) $(GLF_) $(D_)WHICH_CMS="$(WHICH_CMS)"$(_D)
 GLCC=$(CC_) $(GLCCFLAGS)
 GLCCAUX=$(CCAUX_) $(GLCCFLAGS)
-GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_)
-GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_)
-GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_)
-GLJASCC=$(CC_) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_)
 GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_)
 GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_)
-GLJPXOPJCC=$(CC_) $(I_)$(JPX_OPENJPEG_I_)$(D).. $(I_)$(JPX_OPENJPEG_I_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_)
 GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS)
+
+GLJCC=$(CC) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_) $(CCFLAGS)
+GLZCC=$(CC) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_) $(CCFLAGS)
+GLJBIG2CC=$(CC) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_) $(CCFLAGS)
+GLJASCC=$(CC) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) $(CCFLAGS)
+GLJPXOPJCC=$(CC) $(I_)$(JPX_OPENJPEG_I_)$(D).. $(I_)$(JPX_OPENJPEG_I_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) $(CCFLAGS)
+GLFTCC=$(CC) $(FT_CFLAGS) $(D_)FT_CONFIG_OPTIONS_H=\"$(FTCONFH)\"$(_D) $(CCFLAGS) $(GLCCFLAGS)
+
 # We can't use $(CC_) for GLLCMS2MTCC because that includes /Za on
 # msvc builds, and lcms configures itself to depend on msvc extensions
 # (inline asm, including windows.h) when compiled under msvc.
@@ -1327,7 +1330,7 @@ $(GLOBJ)fapi_ft_0.$(OBJ) : $(GLSRC)fapi_ft.c $(AK)\
  $(gsmemory_h) $(gsmalloc_h) $(gxfixed_h) $(gdebug_h) $(gxbitmap_h)\
  $(gsmchunk_h) $(stream_h) $(gxiodev_h) $(gsfname_h) $(gxfapi_h) $(gxfont1_h)\
  $(gxfont_h) $(BASEFTCONFH) $(LIB_MAK) $(MAKEDIRS)
-        $(GLCC) $(FT_CFLAGS) $(D_)FT_CONFIG_OPTIONS_H=\"$(FTCONFH)\"$(_D) $(GLO_)fapi_ft_0.$(OBJ) $(C_) $(GLSRC)fapi_ft.c
+        $(GLFTCC) $(FT_CFLAGS) $(D_)FT_CONFIG_OPTIONS_H=\"$(FTCONFH)\"$(_D) $(GLO_)fapi_ft_0.$(OBJ) $(C_) $(GLSRC)fapi_ft.c
 
 $(GLOBJ)fapi_ft_1.$(OBJ) : $(GLSRC)fapi_ft.c $(AK)\
  $(stdio__h) $(malloc__h) $(write_t1_h) $(write_t2_h) $(math__h) $(gserrors_h)\
diff --git a/base/openjpeg.mak b/base/openjpeg.mak
index 2e1e4c89c..e04091013 100644
--- a/base/openjpeg.mak
+++ b/base/openjpeg.mak
@@ -115,7 +115,9 @@ $(OPEN_JPEG_GEN)openjpeg_0.dev : $(ECHOGS_XE) $(open_jpeg_OBJS) \
         $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS)
 
 # define our specific compiler
-OPEN_JPEG_CC=$(CC) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_)
+OPEN_JPEG_CC=$(CC) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) \
+$(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_) $(CCFLAGS)
+
 OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX)
 
 OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK) $(MAKEDIRS)
diff --git a/base/png.mak b/base/png.mak
index 2d7b38063..604e228f5 100644
--- a/base/png.mak
+++ b/base/png.mak
@@ -60,7 +60,7 @@ PZGEN=$(ZGENDIR)$(D)
 # PI_ and PF_ are defined in gs.mak.
 # NB: we can't use the normal $(CC_) here because msvccmd.mak
 # adds /Za which conflicts with the libpng 1.5.x source.
-PNGCC=$(CC) $(CFLAGS) $(PNG_CFLAGS) $(I_)$(PI_)$(_I) $(I_)$(PNGGENDIR)$(_I) $(PF_) \
+PNGCC=$(CC) $(I_)$(PI_)$(_I) $(I_)$(PNGGENDIR)$(_I) $(PF_) $(CCFLAGS) $(PNG_CFLAGS) \
 $(D_)PNG_NO_ASSEMBLER_CODE$(_D) $(D_)PNG_INTEL_SSE_OPT=0$(_D) \
 $(D_)PNG_INTEL_SSE_IMPLEMENTATION=0$(_D) $(D_)PNG_ARM_NEON_IMPLEMENTATION=0$(_D)
 
diff --git a/base/tiff.mak b/base/tiff.mak
index 905213f39..d9cd93390 100644
--- a/base/tiff.mak
+++ b/base/tiff.mak
@@ -33,7 +33,7 @@ TIFFCONF_H=$(TIFFCONF)libtiff$(D)tiffconf$(TIFFCONFIG_SUFFIX).h
 # Define the name of this makefile.
 LIBTIFF_MAK=$(GLSRC)tiff.mak $(TOP_MAKEFILES)
 
-TIFFCC=$(CC_) $(TIFF_CFLAGS) $(I_)$(TI_) $(II)$(JI_)$(_I) $(PF_)
+TIFFCC=$(CC) $(I_)$(TI_) $(II)$(JI_)$(_I) $(PF_) $(CCFLAGS) $(TIFF_CFLAGS)
 
 TIFFDEP = $(AK) $(TIFFGEN)tif_config.h $(TIFFGEN)tiffconf.h $(LIBTIFF_MAK) $(MAKEDIRS)
 gstiffio_h=$(GLSRC)gstiffio.h
diff --git a/base/zlib.mak b/base/zlib.mak
index f697fdccb..74237aa00 100644
--- a/base/zlib.mak
+++ b/base/zlib.mak
@@ -53,9 +53,10 @@ ZAO_=$(O_)$(ZAUX)
 # syntax from other compilers.
 # ZI_ and ZF_ are defined in gs.mak.
 ZCCFLAGS=$(ZLIB_CFLAGS) $(I_)$(ZI_)$(_I) $(ZF_) $(D_)verbose$(_D_)-1$(_D)
-ZCC=$(CC_) $(ZCCFLAGS)
+ZCC=$(CC) $(ZCCFLAGS) $(CCFLAGS)
+
 ZCCAUXFLAGS=$(ZLIB_CFLAGS) $(I_)$(ZI_)$(_I) $(ZF_) $(D_)verbose$(_D_)-1$(_D)
-ZCCAUX=$(CCAUX_) $(ZCCAUXFLAGS)
+ZCCAUX=$(CCAUX) $(ZCCAUXFLAGS) $(CCFLAGSAUX)
 
 # Define the name of this makefile.
 ZLIB_MAK=$(GLSRC)zlib.mak $(TOP_MAKEFILES)
diff --git a/gpdl/gpdl.mak b/gpdl/gpdl.mak
index f381c8b23..fa8e48faf 100644
--- a/gpdl/gpdl.mak
+++ b/gpdl/gpdl.mak
@@ -72,6 +72,9 @@ LANG_CFLAGS=\
 
 GPDLCC=$(CC_) $(LANG_CFLAGS) $(I_)$(PSSRCDIR)$(_I) $(I_)$(PLSRCDIR)$(_I) $(I_)$(GLSRCDIR)$(_I) $(I_)$(DEVSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(C_)
 
+GPDLJB2CC=$(CC) $(LANG_CFLAGS) $(I_)$(LDF_JB2I_) $(JBIG2_CFLAGS) $(II)$(JB2I_)$(_I) $(I_)$(PSSRCDIR)$(_I) $(I_)$(PLSRCDIR)$(_I) \
+$(I_)$(GLSRCDIR)$(_I) $(I_)$(DEVSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(CCFLAGS) $(C_)
+
 $(GPDLGEN)gpdlimpl.c: $(PLSRC)plimpl.c $(MAKEDIRS)
         $(CP_) $(PLSRC)plimpl.c $(GPDLGEN)gpdlimpl.c
 
@@ -128,7 +131,7 @@ $(GPDL_TIFF_TOP_OBJ): $(GPDLOBJ)tifftop_$(SHARE_LIBTIFF).$(OBJ)
 $(GPDL_JBIG2_TOP_OBJ): $(GPDLSRC)jbig2top.c $(AK)\
  $(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
  $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h)
-        $(GPDLCC) $(I_)$(LDF_JB2I_) $(JBIG2_CFLAGS) $(II)$(JB2I_)$(_I) $(GPDLSRC)jbig2top.c $(GPDLO_)$(GPDL_JBIG2_TOP_OBJ_FILE)
+        $(GPDLJB2CC) $(GPDLSRC)jbig2top.c $(GPDLO_)$(GPDL_JBIG2_TOP_OBJ_FILE)
 
 $(GPDL_JP2K_TOP_OBJ): $(GPDLSRC)jp2ktop.c $(AK)\
  $(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\