Skip to content

Commit 2d8f8a8

Browse files
committed
unix: always symlink libpythonX.Y.a
This was previously behind a conditional on having a binary suffix. In reality the static library is always present and was previously being duplicated as separate files instead of a symlink. This commit should ensure we only have a single copy of the library and that the `python/install/lib/libpythonX.Y.a` symlink always exists. Closes #73.
1 parent 57a57d4 commit 2d8f8a8

File tree

1 file changed

+43
-43
lines changed

1 file changed

+43
-43
lines changed

cpython-unix/build-cpython.sh

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -883,50 +883,50 @@ mkdir -p "${LIB_DYNLOAD}"
883883
touch "${LIB_DYNLOAD}/.empty"
884884

885885
# Symlink libpython so we don't have 2 copies.
886-
if [ -n "${PYTHON_BINARY_SUFFIX}" ]; then
887-
case "${TARGET_TRIPLE}" in
888-
aarch64-unknown-linux-gnu)
889-
PYTHON_ARCH="aarch64-linux-gnu"
890-
;;
891-
# This is too aggressive. But we don't have patches in place for
892-
# setting the platform name properly on non-Darwin.
893-
*-apple-*)
894-
PYTHON_ARCH="darwin"
895-
;;
896-
armv7-unknown-linux-gnueabi)
897-
PYTHON_ARCH="arm-linux-gnueabi"
898-
;;
899-
armv7-unknown-linux-gnueabihf)
900-
PYTHON_ARCH="arm-linux-gnueabihf"
901-
;;
902-
i686-unknown-linux-gnu)
903-
PYTHON_ARCH="i386-linux-gnu"
904-
;;
905-
mips-unknown-linux-gnu)
906-
PYTHON_ARCH="mips-linux-gnu"
907-
;;
908-
mipsel-unknown-linux-gnu)
909-
PYTHON_ARCH="mipsel-linux-gnu"
910-
;;
911-
mips64el-unknown-linux-gnuabi64)
912-
PYTHON_ARCH="mips64el-linux-gnuabi64"
913-
;;
914-
s390x-unknown-linux-gnu)
915-
PYTHON_ARCH="s390x-linux-gnu"
916-
;;
917-
x86_64-unknown-linux-*)
918-
PYTHON_ARCH="x86_64-linux-gnu"
919-
;;
920-
*)
921-
echo "unhandled target triple: ${TARGET_TRIPLE}"
922-
exit 1
923-
esac
924-
925-
LIBPYTHON=libpython${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}.a
926-
ln -sf \
927-
python${PYTHON_MAJMIN_VERSION}/config-${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}-${PYTHON_ARCH}/${LIBPYTHON} \
928-
${ROOT}/out/python/install/lib/${LIBPYTHON}
886+
case "${TARGET_TRIPLE}" in
887+
aarch64-unknown-linux-gnu)
888+
PYTHON_ARCH="aarch64-linux-gnu"
889+
;;
890+
# This is too aggressive. But we don't have patches in place for
891+
# setting the platform name properly on non-Darwin.
892+
*-apple-*)
893+
PYTHON_ARCH="darwin"
894+
;;
895+
armv7-unknown-linux-gnueabi)
896+
PYTHON_ARCH="arm-linux-gnueabi"
897+
;;
898+
armv7-unknown-linux-gnueabihf)
899+
PYTHON_ARCH="arm-linux-gnueabihf"
900+
;;
901+
i686-unknown-linux-gnu)
902+
PYTHON_ARCH="i386-linux-gnu"
903+
;;
904+
mips-unknown-linux-gnu)
905+
PYTHON_ARCH="mips-linux-gnu"
906+
;;
907+
mipsel-unknown-linux-gnu)
908+
PYTHON_ARCH="mipsel-linux-gnu"
909+
;;
910+
mips64el-unknown-linux-gnuabi64)
911+
PYTHON_ARCH="mips64el-linux-gnuabi64"
912+
;;
913+
s390x-unknown-linux-gnu)
914+
PYTHON_ARCH="s390x-linux-gnu"
915+
;;
916+
x86_64-unknown-linux-*)
917+
PYTHON_ARCH="x86_64-linux-gnu"
918+
;;
919+
*)
920+
echo "unhandled target triple: ${TARGET_TRIPLE}"
921+
exit 1
922+
esac
923+
924+
LIBPYTHON=libpython${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}.a
925+
ln -sf \
926+
python${PYTHON_MAJMIN_VERSION}/config-${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}-${PYTHON_ARCH}/${LIBPYTHON} \
927+
${ROOT}/out/python/install/lib/${LIBPYTHON}
929928

929+
if [ -n "${PYTHON_BINARY_SUFFIX}" ]; then
930930
# Ditto for Python executable.
931931
ln -sf \
932932
python${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX} \

0 commit comments

Comments
 (0)