Skip to content

Commit 901fe8d

Browse files
committed
unix: look for glibc symbols in libpython.so
Now that we produce a dynamic libpython, most of the glibc symbols are in it, not the `python` executable.
1 parent 559e50b commit 901fe8d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

cpython-unix/build-cpython.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ fi
273273
# LD_LIBRARY_PATH pointing to the directory containing libpython.
274274
if [ "${PYBUILD_SHARED}" = "1" ]; then
275275
if [ "${PYBUILD_PLATFORM}" = "macos" ]; then
276+
LIBPYTHON_SHARED_LIBRARY=${ROOT}/out/python/install/lib/libpython${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}.dylib
277+
276278
# There's only 1 dylib produced on macOS and it has the binary suffix.
277279
install_name_tool \
278280
-change /install/lib/libpython${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}.dylib @executable_path/../lib/libpython${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}.dylib \
@@ -298,6 +300,8 @@ if [ "${PYBUILD_SHARED}" = "1" ]; then
298300
${ROOT}/out/python/install/bin/python${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}
299301
fi
300302
else
303+
LIBPYTHON_SHARED_LIBRARY=${ROOT}/out/python/install/lib/libpython${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}.so.1.0
304+
301305
patchelf --set-rpath '$ORIGIN/../lib' ${ROOT}/out/python/install/bin/python${PYTHON_MAJMIN_VERSION}
302306
patchelf --set-rpath '$ORIGIN/../lib' ${ROOT}/out/python/install/lib/libpython3.so
303307

@@ -418,7 +422,7 @@ ${ROOT}/out/python/install/bin/python3 ${ROOT}/generate_metadata.py ${ROOT}/meta
418422
cat ${ROOT}/metadata.json
419423

420424
if [ "${CC}" != "musl-clang" ]; then
421-
objdump -T ${PYTHON_EXE} | grep GLIBC_ | awk '{print $5}' | awk -F_ '{print $2}' | sort -V | tail -n 1 > ${ROOT}/glibc_version.txt
425+
objdump -T ${LIBPYTHON_SHARED_LIBRARY} | grep GLIBC_ | awk '{print $5}' | awk -F_ '{print $2}' | sort -V | tail -n 1 > ${ROOT}/glibc_version.txt
422426
cat ${ROOT}/glibc_version.txt
423427
fi
424428

0 commit comments

Comments
 (0)