Revert r82259; still no good way to override instead of replace OPT, but changing...

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2b36b87c377d20d08193708fcbb573660f23c3ea..69a31991892d3e46917d5cd0d2953e7abbdc014e 100644 (file)
--- 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 1cb8c43343bba9a0ea2c16ae86611412f4dc8fed..d0d1993ac194d1266be2df691edba061eb89f690 100644 (file)
--- 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