diff options
| author | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2001-06-02 06:16:02 (GMT) |
|---|---|---|
| committer | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2001-06-02 06:16:02 (GMT) |
| commit | 89e90d67aa73163b368f0dc42ed78310bda00ac5 (patch) | |
| tree | bb7ad7331037051274914dabd6d4231ff396f8f2 /Makefile.pre.in | |
| parent | f4b33f61fb83f54d3086ef28c34e71a18ade2b9d (diff) | |
| download | cpython-89e90d67aa73163b368f0dc42ed78310bda00ac5.zip cpython-89e90d67aa73163b368f0dc42ed78310bda00ac5.tar.gz cpython-89e90d67aa73163b368f0dc42ed78310bda00ac5.tar.bz2 | |
Separate CFLAGS and CPPFLAGS. CFLAGS should not contain preprocessor
directives, which is the role of CPPFLAGS. Closes SF patch #414991.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 103a36b..0354849 100644 --- 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 |