Fallback to musl-gcc for musl CXX

This commit is contained in:
viyatb-oai
2026-01-19 21:36:44 -08:00
parent e8cff7ef77
commit 7f44c725fb
3 changed files with 9 additions and 3 deletions

View File

@@ -269,7 +269,7 @@ jobs:
run: |
set -euo pipefail
sudo apt-get -y update -o Acquire::Retries=3
sudo apt-get -y install --no-install-recommends musl-tools pkg-config g++-musl
sudo apt-get -y install --no-install-recommends musl-tools pkg-config
case "${{ matrix.target }}" in
x86_64-unknown-linux-musl)
arch="x86_64"
@@ -286,6 +286,8 @@ jobs:
cxx="$(command -v "${arch}-linux-musl-g++")"
elif command -v musl-g++ >/dev/null; then
cxx="$(command -v musl-g++")"
elif command -v musl-gcc >/dev/null; then
cxx="$(command -v musl-gcc")"
else
echo "musl g++ not found after install; arch=${arch}" >&2
exit 1

View File

@@ -99,7 +99,7 @@ jobs:
run: |
set -euo pipefail
sudo apt-get update
sudo apt-get install -y musl-tools pkg-config g++-musl
sudo apt-get install -y musl-tools pkg-config
case "${{ matrix.target }}" in
x86_64-unknown-linux-musl)
arch="x86_64"
@@ -116,6 +116,8 @@ jobs:
cxx="$(command -v "${arch}-linux-musl-g++")"
elif command -v musl-g++ >/dev/null; then
cxx="$(command -v musl-g++")"
elif command -v musl-gcc >/dev/null; then
cxx="$(command -v musl-gcc")"
else
echo "musl g++ not found after install; arch=${arch}" >&2
exit 1

View File

@@ -102,7 +102,7 @@ jobs:
run: |
set -euo pipefail
sudo apt-get update
sudo apt-get install -y musl-tools pkg-config g++-musl
sudo apt-get install -y musl-tools pkg-config
case "${{ matrix.target }}" in
x86_64-unknown-linux-musl)
arch="x86_64"
@@ -119,6 +119,8 @@ jobs:
cxx="$(command -v "${arch}-linux-musl-g++")"
elif command -v musl-g++ >/dev/null; then
cxx="$(command -v musl-g++")"
elif command -v musl-gcc >/dev/null; then
cxx="$(command -v musl-gcc")"
else
echo "musl g++ not found after install; arch=${arch}" >&2
exit 1