diff options
| author | Guido van Rossum <guido@python.org> | 2002-12-30 21:04:23 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2002-12-30 21:04:23 (GMT) |
| commit | acd738feb38d64af1c6bdc62dd41cc70efa3d4bc (patch) | |
| tree | 09d6b906ddcc81c0a3bffccd6c764ebe3645364d | |
| parent | c27f4bd423b39391e2160e29ef122d6ef983c67e (diff) | |
| download | cpython-acd738feb38d64af1c6bdc62dd41cc70efa3d4bc.zip cpython-acd738feb38d64af1c6bdc62dd41cc70efa3d4bc.tar.gz cpython-acd738feb38d64af1c6bdc62dd41cc70efa3d4bc.tar.bz2 | |
SF patch 659809, by Daniel Brotsky: fix Makefile.pre to use config
env.
This adds @CFLAGS@ and @CPPFLAGS@ to the end of the respective
variable definitions. It also adds $(LDFLAGS) to the $(CC) invocation
to build $(PGEN).
| -rw-r--r-- | Makefile.pre.in | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 251b820..794e641 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -54,8 +54,8 @@ MAKESETUP= $(srcdir)/Modules/makesetup # Compiler options OPT= @OPT@ -CFLAGS= $(OPT) -CPPFLAGS= -I. -I$(srcdir)/Include +CFLAGS= $(OPT) @CFLAGS@ +CPPFLAGS= -I. -I$(srcdir)/Include @CPPFLAGS@ LDFLAGS= @LDFLAGS@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ @@ -427,7 +427,7 @@ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN) + $(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN) Parser/grammar.o: $(srcdir)/Parser/grammar.c \ $(srcdir)/Include/token.h \ @@ -741,6 +741,9 @@ Tools/Demos Build ----- +- Makefile.pre.in now adds @CFLAGS@ and @CPPFLAGS@ to their respective + variable definitions. + - On Unix, IDLE is now installed automatically. - The fpectl module is not built by default; it's dangerous or useless |