diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-03-21 19:25:26 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-03-21 19:25:26 (GMT) |
| commit | 7a61ba9f0b4a4814209c5ba7294fa61879ec79c5 (patch) | |
| tree | 0a0708e7851565cfb957f03b0fe3493a966ed4ae | |
| parent | eb1361839204f7e85cdcbad934538beb8ac79a36 (diff) | |
| download | cpython-7a61ba9f0b4a4814209c5ba7294fa61879ec79c5.zip cpython-7a61ba9f0b4a4814209c5ba7294fa61879ec79c5.tar.gz cpython-7a61ba9f0b4a4814209c5ba7294fa61879ec79c5.tar.bz2 | |
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.
........
| -rw-r--r-- | Makefile.pre.in | 10 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 0bfaa8f..ea22f12 100644 --- 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 @@ -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. |