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

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

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

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