From 5bb626a3b2f346f93dfbfb35a2ced36f76974519 Mon Sep 17 00:00:00 2001 From: Amin Ya Date: Mon, 7 Apr 2025 11:55:30 -0700 Subject: [PATCH] [vcpkg-script] fix vcpkg bootstrap failing on Musl Arm64 (#44875) --- scripts/bootstrap.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index d4e151b068..def842db1c 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -101,9 +101,7 @@ ARCH="$(uname -m)" if [ -e /etc/alpine-release ]; then vcpkgUseSystem="ON" - if [ "$ARCH" = "x86_64" ]; then - vcpkgUseMuslC="ON" - fi + vcpkgUseMuslC="ON" fi if [ "$UNAME" = "OpenBSD" ]; then @@ -181,7 +179,7 @@ if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." vcpkgToolReleaseSha=$VCPKG_MACOS_SHA vcpkgToolName="vcpkg-macos" -elif [ "$vcpkgUseMuslC" = "ON" ]; then +elif [ "$vcpkgUseMuslC" = "ON" ] && [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-muslc..." vcpkgToolReleaseSha=$VCPKG_MUSLC_SHA vcpkgToolName="vcpkg-muslc" @@ -189,7 +187,7 @@ elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." vcpkgToolReleaseSha=$VCPKG_GLIBC_SHA vcpkgToolName="vcpkg-glibc" -elif [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then +elif [ "$vcpkgUseMuslC" = "OFF" ] && { [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; }; then echo "Downloading vcpkg-arm64-glibc..." vcpkgToolReleaseSha=$VCPKG_GLIBC_ARM64_SHA vcpkgToolName="vcpkg-glibc-arm64"