Merge branch 'main' into no_giflib

This commit is contained in:
Andrew Murray 2025-01-04 17:26:10 +11:00 committed by GitHub
commit 66795e9c26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -98,7 +98,7 @@ function build_harfbuzz {
function build { function build {
build_xz build_xz
if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
yum remove -y zlib-devel yum remove -y zlib-devel
fi fi
build_zlib_ng build_zlib_ng