[Python-checkins] r79221 - in python/branches/py3k: Makefile.pre.in Misc/NEWS
antoine.pitrou
python-checkins at python.org
Sun Mar 21 20:25:26 CET 2010
Author: antoine.pitrou
Date: Sun Mar 21 20:25:26 2010
New Revision: 79221
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Makefile.pre.in
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Makefile.pre.in
==============================================================================
--- python/branches/py3k/Makefile.pre.in (original)
+++ python/branches/py3k/Makefile.pre.in Sun Mar 21 20:25:26 2010
@@ -59,7 +59,7 @@
# 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 @@
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 @@
# 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
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Sun Mar 21 20:25:26 2010
@@ -848,6 +848,10 @@
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.
More information about the Python-checkins
mailing list