Skip to content

C
cpython
Commit 5ee95474 authored by Guido van Rossum's avatar Guido van Rossum
Browse files
Options

Revert SF patch 659809 -- it causes double options that can cause breakage.

parent f3edea5b
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
Makefile.pre.in
View file @ 5ee95474
...@@ -54,8 +54,8 @@ MAKESETUP= $(srcdir)/Modules/makesetup ...@@ -54,8 +54,8 @@ MAKESETUP= $(srcdir)/Modules/makesetup
# Compiler options # Compiler options
OPT= @OPT@ OPT= @OPT@
CFLAGS= $(OPT) @CFLAGS@ CFLAGS= $(OPT)
CPPFLAGS= -I. -I$(srcdir)/Include @CPPFLAGS@ CPPFLAGS= -I. -I$(srcdir)/Include
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) ...@@ -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) $(LDFLAGS) $(LIBS) -o $(PGEN) $(CC) $(OPT) $(PGENOBJS) $(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 \
......
Misc/NEWS
View file @ 5ee95474
...@@ -764,9 +764,6 @@ Tools/Demos ...@@ -764,9 +764,6 @@ 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7