Merged revisions 79218 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79218 | antoine.pitrou | 2010-03-21 20:19:41 +0100 (dim., 21 mars 2010) | 5 lines

  Issue #1628484: The Makefile doesn't ignore the CFLAGS environment
  variable anymore.  It also forwards the LDFLAGS settings to the linker
  when building a shared library.
........

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5d70f106b82b46eb2d033ad399ace9a9b513185e..bb230bb04e5c7ed46f7890b0b6a5398efeb5772c 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -57,7 +57,7 @@ MAKESETUP=      $(srcdir)/Modules/makesetup
 # Compiler options
 OPT=           @OPT@
 BASECFLAGS=    @BASECFLAGS@
-CFLAGS=                $(BASECFLAGS) $(OPT) $(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
@@ -86,8 +86,8 @@ exec_prefix=  @exec_prefix@
 datarootdir=    @datarootdir@
 
 # Expanded directories
-BINDIR=                $(exec_prefix)/bin
-LIBDIR=                $(exec_prefix)/lib
+BINDIR=                @bindir@
+LIBDIR=                @libdir@
 MANDIR=                @mandir@
 INCLUDEDIR=    @includedir@
 CONFINCLUDEDIR=        $(exec_prefix)/include
@@ -394,8 +394,8 @@ platform: $(BUILDPYTHON)
 # Build the shared modules
 sharedmods: $(BUILDPYTHON)
        @case $$MAKEFLAGS in \
-       *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-       *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+       *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+       *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
        esac
 
 # Build static library

diff --git a/Misc/NEWS b/Misc/NEWS
index 1ab0c8809bdfe9c2db25f315b6c01ea8bcb49006..d390a2d0b8e6b0a470bd34fb976cde37b7a71133 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,13 @@ Library
 - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
   the locale.
 
+Build
+-----
+
+- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment
+  variable anymore.  It also forwards the LDFLAGS settings to the linker
+  when building a shared library.
+
 
 What's New in Python 2.6.5?
 ===========================