traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 79221 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79221 | antoine.pitrou | 2010-03-21 20:25:26 +0100 (dim., 21 mars 2010) | 11 lines

  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.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-03-21 19:27:27 +00:00
parent 5391211b54
commit e1947beba0
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.pre.in
View File

@ -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
@ -417,8 +417,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

13
Misc/NEWS
View File

@ -4,6 +4,19 @@ Python News
(editors: check NEWS.help for information about editing NEWS using ReST.)
What's New in Python 3.1.3?
===========================
*Release date: 20XX-XX-XX*
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 3.1.2?
===========================