Skip to content

bpo-21536: Follow-up to #13549 #13552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2019
Merged

bpo-21536: Follow-up to #13549 #13552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fc56cc
Fix this test and invert the sense of it somewhat so that it's clearer
embray May 24, 2019
5924bca
Add missing AC_MSG_RESULT for AC_MSG_CHECKING(MACHDEP)
embray May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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


Expand Down
7 changes: 4 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ then
'') MACHDEP="unknown";;
esac
fi
AC_MSG_RESULT("$MACHDEP")

AC_SUBST(_PYTHON_HOST_PLATFORM)
if test "$cross_compiling" = yes; then
Expand Down Expand Up @@ -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.
Expand Down