cpython: 6316475af62d (original) (raw)

Mercurial > cpython

changeset 92729:6316475af62d 2.7

- Issue #18096: Fix library order returned by python-config. [#18096]

doko@ubuntu.com
date	Thu, 02 Oct 2014 01:58:58 +0200
parents	c4284fa75ec7
children	222e0faa5fa9
files	Misc/NEWS Misc/python-config.in
diffstat	2 files changed, 5 insertions(+), 2 deletions(-)[+] [-] Misc/NEWS 2 Misc/python-config.in 5

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -242,6 +242,8 @@ Build

Issue #21166: Prevent possible segfaults and other random failures of python --generate-posix-vars in pybuilddir.txt build target. +- Issue #18096: Fix library order returned by python-config. + Windows -------

--- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -44,8 +44,9 @@ for opt in opt_flags: print ' '.join(flags) elif opt in ('--libs', '--ldflags'):

   libs = getvar('LIBS').split() + getvar('SYSLIBS').split()[](#l2.7)

   libs.append('-lpython'+pyver)[](#l2.8)

```
   libs = ['-lpython' + pyver][](#l2.9)
```

   libs += getvar('LIBS').split()[](#l2.10)

   libs += getvar('SYSLIBS').split()[](#l2.11)
   # add the prefix/lib/pythonX.Y/config dir, but only if there is no[](#l2.12)
   # shared library in prefix/lib/.[](#l2.13)
   if opt == '--ldflags':[](#l2.14)