gh-99942: correct the pkg-config/python-config flags for cygwin/android

eli-schwartz · web-flow · commit 226484e47599 · 2023-02-16T17:57:59.000Z
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
@@ -0,0 +1,2 @@
+On Android, in a static build, python-config in embed mode no longer
+incorrectly reports a library to link to.
diff --git a/configure b/configure
diff --git 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=''

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+On Android, in a static build, python-config in embed mode no longer`
	`2`	`+incorrectly reports a library to link to.`