summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2010-06-27 20:40:18 (GMT)
committerBrett Cannon <bcannon@gmail.com>2010-06-27 20:40:18 (GMT)
commitc1c7cf682ac0f709475e9d3146651da4735df28e (patch)
tree840241906a4dcb21bcf46c38d454725af540b07d
parentd19052c161b737a6f13624cad607bcbe91ae0604 (diff)
downloadcpython-c1c7cf682ac0f709475e9d3146651da4735df28e.zip
cpython-c1c7cf682ac0f709475e9d3146651da4735df28e.tar.gz
cpython-c1c7cf682ac0f709475e9d3146651da4735df28e.tar.bz2
Revert r82259; still no good way to override instead of replace OPT, but changing order alters pydebug optimization flags.
-rw-r--r--Makefile.pre.in2
-rw-r--r--Misc/NEWS2
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2b36b87..69a3199 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -59,7 +59,7 @@ MAKESETUP= $(srcdir)/Modules/makesetup
# Compiler options
OPT= @OPT@
BASECFLAGS= @BASECFLAGS@
-CFLAGS= $(BASECFLAGS) $(OPT) @CFLAGS@ $(EXTRA_CFLAGS)
+CFLAGS= $(BASECFLAGS) @CFLAGS@ $(OPT) $(EXTRA_CFLAGS)
# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
# be able to build extension modules using the directories specified in the
# environment variables
diff --git a/Misc/NEWS b/Misc/NEWS
index 1cb8c43..d0d1993 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1463,8 +1463,6 @@ Extension Modules
Build
-----
-- Have CFLAGS come after OPT to allow for overriding warnings flags.
-
- Issue #8854: Fix finding Visual Studio 2008 on Windows x64.
- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for