mirror of https://github.com/python/cpython.git
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).
This commit is contained in:
parent
c27f4bd423
commit
acd738feb3
|
@ -54,8 +54,8 @@ MAKESETUP= $(srcdir)/Modules/makesetup
|
||||||
|
|
||||||
# Compiler options
|
# Compiler options
|
||||||
OPT= @OPT@
|
OPT= @OPT@
|
||||||
CFLAGS= $(OPT)
|
CFLAGS= $(OPT) @CFLAGS@
|
||||||
CPPFLAGS= -I. -I$(srcdir)/Include
|
CPPFLAGS= -I. -I$(srcdir)/Include @CPPFLAGS@
|
||||||
LDFLAGS= @LDFLAGS@
|
LDFLAGS= @LDFLAGS@
|
||||||
LDLAST= @LDLAST@
|
LDLAST= @LDLAST@
|
||||||
SGI_ABI= @SGI_ABI@
|
SGI_ABI= @SGI_ABI@
|
||||||
|
@ -427,7 +427,7 @@ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
|
||||||
-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
||||||
|
|
||||||
$(PGEN): $(PGENOBJS)
|
$(PGEN): $(PGENOBJS)
|
||||||
$(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
|
$(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN)
|
||||||
|
|
||||||
Parser/grammar.o: $(srcdir)/Parser/grammar.c \
|
Parser/grammar.o: $(srcdir)/Parser/grammar.c \
|
||||||
$(srcdir)/Include/token.h \
|
$(srcdir)/Include/token.h \
|
||||||
|
|
|
@ -741,6 +741,9 @@ Tools/Demos
|
||||||
Build
|
Build
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
- Makefile.pre.in now adds @CFLAGS@ and @CPPFLAGS@ to their respective
|
||||||
|
variable definitions.
|
||||||
|
|
||||||
- On Unix, IDLE is now installed automatically.
|
- On Unix, IDLE is now installed automatically.
|
||||||
|
|
||||||
- The fpectl module is not built by default; it's dangerous or useless
|
- The fpectl module is not built by default; it's dangerous or useless
|
||||||
|
|
Loading…
Reference in New Issue