summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2014-10-02 00:00:14 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2014-10-02 00:00:14 (GMT)
commitd486c43d8d5ddf6d8c31e37fa5525aac7b960059 (patch)
treea6858aa6bfe6433de255253bcf2c4c563ec33613 /Misc
parent1de0ba2cf57a2c0f18a1ef4da0641bf9b073ba1e (diff)
downloadcpython-d486c43d8d5ddf6d8c31e37fa5525aac7b960059.zip
cpython-d486c43d8d5ddf6d8c31e37fa5525aac7b960059.tar.gz
cpython-d486c43d8d5ddf6d8c31e37fa5525aac7b960059.tar.bz2
- Issue #18096: Fix library order returned by python-config.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
-rw-r--r--Misc/python-config.in5
-rw-r--r--Misc/python-config.sh.in2
3 files changed, 6 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 182032a..ffb852f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,6 +38,8 @@ Build
- Issue #16537: Check whether self.extensions is empty in setup.py. Patch by
Jonathan Hosmer.
+- Issue #18096: Fix library order returned by python-config.
+
What's New in Python 3.4.2?
===========================
diff --git a/Misc/python-config.in b/Misc/python-config.in
index 0b9b5dc..e13da75 100644
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -47,8 +47,9 @@ for opt in opt_flags:
print(' '.join(flags))
elif opt in ('--libs', '--ldflags'):
- libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
- libs.append('-lpython' + pyver + sys.abiflags)
+ libs = ['-lpython' + pyver + sys.abiflags]
+ libs += getvar('LIBS').split()
+ libs += getvar('SYSLIBS').split()
# add the prefix/lib/pythonX.Y/config dir, but only if there is no
# shared library in prefix/lib/.
if opt == '--ldflags':
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
index f5a3dbe..64c81e5 100644
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
@@ -40,7 +40,7 @@ LIBM="@LIBM@"
LIBC="@LIBC@"
SYSLIBS="$LIBM $LIBC"
ABIFLAGS="@ABIFLAGS@"
-LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}${ABIFLAGS}"
+LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
BASECFLAGS="@BASECFLAGS@"
LDLIBRARY="@LDLIBRARY@"
LINKFORSHARED="@LINKFORSHARED@"