@@ -391,7 +391,7 @@ if [ "${CC}" = "musl-clang" ]; then
391391 # provided by musl. These are part of the include files that are part of clang.
392392 # But musl-clang eliminates them from the default include path. So copy them into
393393 # place.
394- for h in /tools/${TOOLCHAIN} /lib/clang/* /include/* intrin.h /tools/${TOOLCHAIN} /lib/clang/* /include/{__wmmintrin_aes.h,__wmmintrin_pclmul.h,mm_malloc.h}; do
394+ for h in /tools/${TOOLCHAIN} /lib/clang/* /include/* intrin.h /tools/${TOOLCHAIN} /lib/clang/* /include/{__wmmintrin_aes.h,__wmmintrin_pclmul.h,mm_malloc.h,cpuid.h }; do
395395 filename=$( basename " $h " )
396396 if [ -e " /tools/host/include/${filename} " ]; then
397397 echo " ${filename} already exists; don't need to copy!"
@@ -416,7 +416,7 @@ if [ -n "${CPYTHON_DEBUG}" ]; then
416416fi
417417
418418# Explicitly enable mimalloc on 3.13+, it's already included by default but with this it'll fail
419- # if it's missing from the system. The MUSL builds do not supprt mimalloc yet.
419+ # if it's missing from the system. The musl builds do not supprt mimalloc yet.
420420if [[ -n " ${PYTHON_MEETS_MINIMUM_VERSION_3_13} " && " ${CC} " != " musl-clang" ]]; then
421421 CONFIGURE_FLAGS=" ${CONFIGURE_FLAGS} --with-mimalloc"
422422fi
@@ -974,7 +974,7 @@ s390x-unknown-linux-gnu)
974974x86_64-unknown-linux-* )
975975 # In Python 3.13+, the musl target is identified in cross compiles and the output directory
976976 # is named accordingly.
977- if [ " ${CC} " = " musl-clang" ] && [ " ${PYTHON_MAJMIN_VERSION } " = " 3.13 " ]; then
977+ if [[ " ${CC} " = " musl-clang" && -n " ${PYTHON_MEETS_MINIMUM_VERSION_3_13 } " ] ]; then
978978 PYTHON_ARCH=" x86_64-linux-musl"
979979 else
980980 PYTHON_ARCH=" x86_64-linux-gnu"
0 commit comments