mirror of https://github.com/python/cpython
- Issue #18096: Fix library order returned by python-config.
This commit is contained in:
commit
6b6bcc3e21
|
@ -1058,6 +1058,8 @@ Build
|
||||||
- Issue #21166: Prevent possible segfaults and other random failures of
|
- Issue #21166: Prevent possible segfaults and other random failures of
|
||||||
python --generate-posix-vars in pybuilddir.txt build target.
|
python --generate-posix-vars in pybuilddir.txt build target.
|
||||||
|
|
||||||
|
- Issue #18096: Fix library order returned by python-config.
|
||||||
|
|
||||||
C API
|
C API
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,9 @@ for opt in opt_flags:
|
||||||
print(' '.join(flags))
|
print(' '.join(flags))
|
||||||
|
|
||||||
elif opt in ('--libs', '--ldflags'):
|
elif opt in ('--libs', '--ldflags'):
|
||||||
libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
|
libs = ['-lpython' + pyver + sys.abiflags]
|
||||||
libs.append('-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
|
# add the prefix/lib/pythonX.Y/config dir, but only if there is no
|
||||||
# shared library in prefix/lib/.
|
# shared library in prefix/lib/.
|
||||||
if opt == '--ldflags':
|
if opt == '--ldflags':
|
||||||
|
|
|
@ -40,7 +40,7 @@ LIBM="@LIBM@"
|
||||||
LIBC="@LIBC@"
|
LIBC="@LIBC@"
|
||||||
SYSLIBS="$LIBM $LIBC"
|
SYSLIBS="$LIBM $LIBC"
|
||||||
ABIFLAGS="@ABIFLAGS@"
|
ABIFLAGS="@ABIFLAGS@"
|
||||||
LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}${ABIFLAGS}"
|
LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
|
||||||
BASECFLAGS="@BASECFLAGS@"
|
BASECFLAGS="@BASECFLAGS@"
|
||||||
LDLIBRARY="@LDLIBRARY@"
|
LDLIBRARY="@LDLIBRARY@"
|
||||||
LINKFORSHARED="@LINKFORSHARED@"
|
LINKFORSHARED="@LINKFORSHARED@"
|
||||||
|
|
Loading…
Reference in New Issue