From: Brett Cannon <bcannon@gmail.com>
Date: Sun, 27 Jun 2010 20:40:18 +0000 (+0000)
Subject: Revert r82259; still no good way to override instead of replace OPT, but changing... 
X-Git-Tag: v3.2a1~434
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1c7cf682ac0f709475e9d3146651da4735df28e;p=thirdparty%2FPython%2Fcpython.git

Revert r82259; still no good way to override instead of replace OPT, but changing order alters pydebug optimization flags.
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2b36b87c377d..69a31991892d 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 1cb8c43343bb..d0d1993ac194 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