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

doko42 · doko42 · commit 6b6bcc3e21b1 · 2014-10-02T02:02:45.000+02:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -1058,6 +1058,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.
+
 C API
 -----
 
diff --git 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
@@ -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@"
