test musl cross-builds 2

curl · Oct 30, 2023 · 63e5d93 · 63e5d93
1 parent 68b7166
commit 63e5d93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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"