diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2023-02-16 17:57:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 17:57:59 (GMT) |
| commit | 226484e47599a93f5bf033ac47198e68ff401432 (patch) | |
| tree | 466f89c4e4b7fa135d9d74f9245f29294ab9ec74 | |
| parent | 68bd8c5e2efab64ff9d38a214775164182179431 (diff) | |
| download | cpython-226484e47599a93f5bf033ac47198e68ff401432.zip cpython-226484e47599a93f5bf033ac47198e68ff401432.tar.gz cpython-226484e47599a93f5bf033ac47198e68ff401432.tar.bz2 | |
gh-99942: correct the pkg-config/python-config flags for cygwin/android
| -rw-r--r-- | Misc/NEWS.d/next/Build/2023-01-12-00-49-16.gh-issue-99942.DUR8b4.rst | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Build/2023-01-12-00-49-16.gh-issue-99942.DUR8b4.rst b/Misc/NEWS.d/next/Build/2023-01-12-00-49-16.gh-issue-99942.DUR8b4.rst new file mode 100644 index 0000000..5b692c3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-01-12-00-49-16.gh-issue-99942.DUR8b4.rst @@ -0,0 +1,2 @@ +On Android, in a static build, python-config in embed mode no longer +incorrectly reports a library to link to. @@ -21496,7 +21496,7 @@ $as_echo "$LDVERSION" >&6; } # On Android and Cygwin the shared libraries must be linked with libpython. -if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then +if test "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" else LIBPYTHON='' diff --git a/configure.ac b/configure.ac index 370bbe0..bc288b8 100644 --- a/configure.ac +++ b/configure.ac @@ -5759,7 +5759,7 @@ AC_MSG_RESULT($LDVERSION) # On Android and Cygwin the shared libraries must be linked with libpython. AC_SUBST(LIBPYTHON) -if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then +if test "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" else LIBPYTHON='' |