diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-04-09 16:12:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 16:12:44 (GMT) |
| commit | e65f01f78d7bda3013fc5be485afa87ff56511d9 (patch) | |
| tree | 01b62d53ee1489e18155a1fb183b4a488b8d09fc /Misc | |
| parent | 2ee077f7955e0349074f16a7afee40b4914619f7 (diff) | |
| download | cpython-e65f01f78d7bda3013fc5be485afa87ff56511d9.zip cpython-e65f01f78d7bda3013fc5be485afa87ff56511d9.tar.gz cpython-e65f01f78d7bda3013fc5be485afa87ff56511d9.tar.bz2 | |
bpo-36508: python-config don't export LINKFORSHARED (GH-12661)
python-config --ldflags no longer includes flags of the LINKFORSHARED
variable. The LINKFORSHARED variable must only be used to build
executables.
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/NEWS.d/next/Build/2019-04-02-17-01-23.bpo-36508.SN5Y6N.rst | 3 | ||||
| -rw-r--r-- | Misc/python-config.in | 2 | ||||
| -rw-r--r-- | Misc/python-config.sh.in | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Misc/NEWS.d/next/Build/2019-04-02-17-01-23.bpo-36508.SN5Y6N.rst b/Misc/NEWS.d/next/Build/2019-04-02-17-01-23.bpo-36508.SN5Y6N.rst new file mode 100644 index 0000000..62f8084 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-04-02-17-01-23.bpo-36508.SN5Y6N.rst @@ -0,0 +1,3 @@ +``python-config --ldflags`` no longer includes flags of the +``LINKFORSHARED`` variable. The ``LINKFORSHARED`` variable must only be used +to build executables. diff --git a/Misc/python-config.in b/Misc/python-config.in index e13da75..7144152 100644 --- a/Misc/python-config.in +++ b/Misc/python-config.in @@ -55,8 +55,6 @@ for opt in opt_flags: if opt == '--ldflags': if not getvar('Py_ENABLE_SHARED'): libs.insert(0, '-L' + getvar('LIBPL')) - if not getvar('PYTHONFRAMEWORK'): - libs.extend(getvar('LINKFORSHARED').split()) print(' '.join(libs)) elif opt == '--extension-suffix': diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in index d1d3275..a3c479c 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -44,7 +44,6 @@ ABIFLAGS="@ABIFLAGS@" LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" BASECFLAGS="@BASECFLAGS@" LDLIBRARY="@LDLIBRARY@" -LINKFORSHARED="@LINKFORSHARED@" OPT="@OPT@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" LDVERSION="@LDVERSION@" @@ -89,15 +88,11 @@ do echo "$LIBS" ;; --ldflags) - LINKFORSHAREDUSED= - if [ -z "$PYTHONFRAMEWORK" ] ; then - LINKFORSHAREDUSED=$LINKFORSHARED - fi LIBPLUSED= if [ "$PY_ENABLE_SHARED" = "0" ] ; then LIBPLUSED="-L$LIBPL" fi - echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED" + echo "$LIBPLUSED -L$libdir $LIBS" ;; --extension-suffix) echo "$SO" |