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 0bfaa8fcbdb005cc88a730553142e0829bd3c63a..ea22f1258ae4629d8c2e1322ddf5901e77792240 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) $(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
@@ -89,8 +89,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
@@ -418,8 +418,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 b2684ddfa3dba029a7553b3da1f1d5e704143c16..c287e0c2916e249366932ab193755cd44a914c39 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -848,6 +848,10 @@ Extension Modules
 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.
+
 - Issue #6716: Quote -x arguments of compileall in MSI installer.
   Exclude 2to3 tests from compileall.