mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
bpo-21536: Fix configure.ac for LIBPYTHON on Android/Cygwin (GH-13552)
Add also missing AC_MSG_RESULT for AC_MSG_CHECKING(MACHDEP).
This commit is contained in:
parent
bc66faccb8
commit
b1fc417841
8
configure
vendored
8
configure
vendored
|
@ -3292,6 +3292,8 @@ then
|
|||
'') MACHDEP="unknown";;
|
||||
esac
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$MACHDEP\"" >&5
|
||||
$as_echo "\"$MACHDEP\"" >&6; }
|
||||
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
|
@ -15131,10 +15133,10 @@ $as_echo "$LDVERSION" >&6; }
|
|||
|
||||
# On Android and Cygwin the shared libraries must be linked with libpython.
|
||||
|
||||
if test -z "$ANDROID_API_LEVEL" -o "$MACHDEP" != "cygwin"; then
|
||||
LIBPYTHON=''
|
||||
else
|
||||
if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then
|
||||
LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
|
||||
else
|
||||
LIBPYTHON=''
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
@ -411,6 +411,7 @@ then
|
|||
'') MACHDEP="unknown";;
|
||||
esac
|
||||
fi
|
||||
AC_MSG_RESULT("$MACHDEP")
|
||||
|
||||
AC_SUBST(_PYTHON_HOST_PLATFORM)
|
||||
if test "$cross_compiling" = yes; then
|
||||
|
@ -4622,10 +4623,10 @@ AC_MSG_RESULT($LDVERSION)
|
|||
|
||||
# On Android and Cygwin the shared libraries must be linked with libpython.
|
||||
AC_SUBST(LIBPYTHON)
|
||||
if test -z "$ANDROID_API_LEVEL" -o "$MACHDEP" != "cygwin"; then
|
||||
LIBPYTHON=''
|
||||
else
|
||||
if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then
|
||||
LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
|
||||
else
|
||||
LIBPYTHON=''
|
||||
fi
|
||||
|
||||
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
||||
|
|
Loading…
Reference in a new issue