Skip to content

Commit 7e8aa89

Browse files
committed
Move -L. to makesetup, since that's the only place it's needed
1 parent df4986b commit 7e8aa89

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fix LIBPYTHON substitution in python3.pc on Android
1+
Fix library name in python3.pc on Android.

Modules/makesetup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
277277
;;
278278
esac
279279
rule="$file: $objs \$(MODULE_${mods_upper}_LDEPS)"
280-
rule="$rule; \$(BLDSHARED) $objs $libs \$(BLDLIBRARY) -o $file"
280+
rule="$rule; \$(BLDSHARED) $objs $libs -L. \$(LIBPYTHON) -o $file"
281281
echo "$rule" >>$rulesf
282282
done
283283
done

configure

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6680,7 +6680,7 @@ LIBPYTHON=''
66806680
# On Android and Cygwin the shared libraries must be linked with libpython.
66816681
if test "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then
66826682
MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(LDLIBRARY)"
6683-
LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
6683+
LIBPYTHON="-lpython${LDVERSION}"
66846684
fi
66856685

66866686
# On iOS the shared libraries must be linked with the Python framework

0 commit comments

Comments
 (0)