Skip to content

[vcpkg-script] fix vcpkg bootstrap failing on Musl Arm64 #44875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 1 commit into from
Apr 7, 2025
Merged

[vcpkg-script] fix vcpkg bootstrap failing on Musl Arm64 #44875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions scripts/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -181,15 +179,15 @@ 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"
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"
Expand Down