Separate CFLAGS and CPPFLAGS. CFLAGS should not contain preprocessor

directives, which is the role of CPPFLAGS.  Closes SF patch #414991.

diff --git a/Demo/embed/Makefile b/Demo/embed/Makefile
index ebc274fa7b1c8dbaac30b8f3f4aa7299fb8e858b..bdb381ed87351b6fbf42a6cd6f9e91baaeb18fc4 100644 (file)
--- a/Demo/embed/Makefile
+++ b/Demo/embed/Makefile
@@ -15,7 +15,8 @@ VERSION=      2.1
 # Compiler flags
 OPT=           -g
 INCLUDES=      -I$(srcdir)/Include -I$(blddir)
-CFLAGS=                $(OPT) $(INCLUDES)
+CFLAGS=                $(OPT)
+CPPFLAGS=      $(INCLUDES)
 
 # The Python library
 LIBPYTHON=     $(blddir)/libpython$(VERSION).a

diff --git a/Demo/pysvr/Makefile b/Demo/pysvr/Makefile
index 7e3655354e2d5ff203c0ff0e901a1393bfe610c9..cb6605fa9ef92597642ffbef5ebffbf3effd7d27 100644 (file)
--- a/Demo/pysvr/Makefile
+++ b/Demo/pysvr/Makefile
@@ -31,7 +31,8 @@ RLLIBS=-lreadline -ltermcap
 OTHERLIBS=-lnsl -lpthread -ldl -lm -ldb -lutil
 
 # Compilation and link flags -- no need to change normally
-CFLAGS=$(PYINCL) $(OPT)
+CFLAGS=$(OPT)
+CPPFLAGS=$(PYINCL)
 LIBS=$(PYLIBS) $(RLLIBS) $(OTHERLIBS)
 
 # Default port for the pysvr application

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 103a36b345894be7f49c3b994725b1cd791f7be5..0354849404bfa86d41c106ac479e442bf5737d80 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -55,7 +55,8 @@ MAKESETUP=      $(srcdir)/Modules/makesetup
 # Compiler options
 OPT=           @OPT@
 DEFS=          @DEFS@
-CFLAGS=                $(OPT) -I. -I$(srcdir)/Include $(DEFS)
+CFLAGS=                $(OPT)
+CPPFLAGS=      -I. -I$(srcdir)/Include $(DEFS)
 LDFLAGS=       @LDFLAGS@
 LDLAST=                @LDLAST@
 SGI_ABI=       @SGI_ABI@
@@ -64,7 +65,7 @@ LINKFORSHARED=        @LINKFORSHARED@
 # Extra C flags added for building the interpreter object files.
 CFLAGSFORSHARED=@CFLAGSFORSHARED@
 # C flags used for building the interpreter object files
-PY_CFLAGS=     $(CFLAGS) $(CFLAGSFORSHARED)
+PY_CFLAGS=     $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED)
 
 
 # Machine-dependent subdirectories
@@ -283,7 +284,8 @@ platform: $(PYTHON)
 
 # Build the shared modules
 sharedmods: $(PYTHON)
-       PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py build
+       unset PYTHONPATH PYTHONHOME PYTHONSTARTUP; \
+               ./$(PYTHON) $(srcdir)/setup.py build
 
 # buildno should really depend on something like LIBRARY_SRC
 buildno: $(PARSER_OBJS) \
@@ -399,10 +401,10 @@ Parser/metagrammar.o:     $(srcdir)/Parser/metagrammar.c
 Python/compile.o Python/symtable.o: $(GRAMMAR_H)
 
 Python/getplatform.o: $(srcdir)/Python/getplatform.c
-               $(CC) -c $(CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
+               $(CC) -c $(CFLAGS) $(CPPFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
 
 Python/importdl.o: $(srcdir)/Python/importdl.c
-               $(CC) -c $(CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
+               $(CC) -c $(CFLAGS) $(CPPFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
 
 Objects/object.o: $(srcdir)/Objects/object.c $(srcdir)/Objects/obmalloc.c
 

diff --git a/Misc/Makefile.pre.in b/Misc/Makefile.pre.in
index 2d14294054a0d0e323456236931f1628002f052f..01b49013661673d22217e90f5266783270c4f850 100644 (file)
--- a/Misc/Makefile.pre.in
+++ b/Misc/Makefile.pre.in
@@ -95,7 +95,8 @@ TARGET=               python
 PYTHON=                python
 
 # Add more -I and -D options here
-CFLAGS=                $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+CFLAGS=                $(OPT)
+CPPFLAGS=      -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
 
 # These two variables can be set in Setup to merge extensions.
 # See example[23].
@@ -228,7 +229,7 @@ do-it-again:
 
 # Make config.o from the config.c created by makesetup
 config.o:      config.c
-               $(CC) $(CFLAGS) -c config.c
+               $(CC) $(CFLAGS) $(CPPFLAGS) -c config.c
 
 # Setup is copied from Setup.in *only* if it doesn't yet exist
 Setup:

diff --git a/Modules/makesetup b/Modules/makesetup
index 8fd6d5e0afbb73b53e0d39cd7646606efc67ca2e..f4287a58a4562e507d65ef43b642ac5e8f9045dd 100755 (executable)
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -216,7 +216,7 @@ sed -e 's/[         ]*#.*//' -e '/^[        ]*$/d' |
                        *) src='$(srcdir)/'"$srcdir/$src";;
                        esac
                        case $doconfig in
-                       no)     cc="$cc \$(CCSHARED) \$(CFLAGS)";;
+                       no)     cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";;
                        *)
                                cc="$cc \$(PY_CFLAGS)";;
                        esac

diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py
index dfd0369627d8825520905e16c5a4a27db85aeb4b..b534098b22ce2237cf2d52f6e34fb2b640213293 100755 (executable)
--- a/Tools/freeze/freeze.py
+++ b/Tools/freeze/freeze.py
@@ -424,7 +424,8 @@ def main():
         outfp.close()
     infp.close()
 
-    cflags = defines + includes + ['$(OPT)']
+    cflags = ['$(OPT)']
+    cppflags = defines + includes
     libs = [os.path.join(binlib, 'libpython$(VERSION).a')]
 
     somevars = {}
@@ -434,6 +435,7 @@ def main():
         somevars[key] = makevars[key]
 
     somevars['CFLAGS'] = string.join(cflags) # override
+    somevars['CPPFLAGS'] = string.join(cppflags) # override
     files = ['$(OPT)', '$(LDFLAGS)', base_config_c, base_frozen_c] + \
             files + supp_sources +  addfiles + libs + \
             ['$(MODLIBS)', '$(LIBS)', '$(SYSLIBS)']

diff --git a/Tools/freeze/makemakefile.py b/Tools/freeze/makemakefile.py
index 4d9913ee7c278624daaa2e1cf9ac593bf8e93be8..b1bad2b46dae037e5cc35ef43a814d8e04d863e7 100644 (file)
--- a/Tools/freeze/makemakefile.py
+++ b/Tools/freeze/makemakefile.py
@@ -19,7 +19,7 @@ def makemakefile(outfp, makevars, files, target):
             base = os.path.basename(file)
             dest = base[:-2] + '.o'
             outfp.write("%s: %s\n" % (dest, file))
-            outfp.write("\t$(CC) $(CFLAGS) -c %s\n" % file)
+            outfp.write("\t$(CC) $(CFLAGS) $(CPPFLAGS) -c %s\n" % file)
             files[i] = dest
             deps.append(dest)