From 63e5d9378d829cb8be6fd2898bcb3a13eb18b8f3 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Mon, 30 Oct 2023 09:13:52 +0000
Subject: [PATCH] test musl cross-builds 2

---
 .github/workflows/build.yml | 4 ++--
 _ci-linux-debian.sh         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3390fe58..529b5d201 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,7 @@ jobs:
         run: cat urls.txt
       - uses: actions/upload-artifact@v3
         with:
-          name: 'curl-linux-musl-debian-testing-x86_64'
+          name: 'curl-linux-musl-debian-testing'
           retention-days: 5
           path: |
             *-*-linux*.*
@@ -99,7 +99,7 @@ jobs:
         run: cat urls.txt
       - uses: actions/upload-artifact@v3
         with:
-          name: 'curl-linux-musl-debian-bookworm-x86_64'
+          name: 'curl-linux-musl-debian-bookworm'
           retention-days: 5
           path: |
             *-*-linux*.*
diff --git a/_ci-linux-debian.sh b/_ci-linux-debian.sh
index 0ce4a235a..0125cd498 100755
--- a/_ci-linux-debian.sh
+++ b/_ci-linux-debian.sh
@@ -33,10 +33,10 @@ elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
     extra="${extra} musl musl-dev"
     if [ "$(uname -m)" = 'aarch64' ]; then
       dpkg --add-architecture amd64
-      extra="${extra} musl:amd64 musl-dev:amd64"
+      extra="${extra} musl:amd64 musl-dev:amd64 g++${CW_GCCSUFFIX}-x86-64-linux-gnu"
     else
       dpkg --add-architecture arm64
-      extra="${extra} musl:arm64 musl-dev:arm64"
+      extra="${extra} musl:arm64 musl-dev:arm64 g++${CW_GCCSUFFIX}-aarch64-linux-gnu"
     fi
     if [[ "${CW_CONFIG:-}" = *'gcc'* ]]; then
       extra="${extra} libgcc${CW_GCCSUFFIX}-dev"