try installing libstdc++ 1

curl · Nov 9, 2024 · 748010c · 748010c
1 parent e81f877
commit 748010c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -135,7 +135,6 @@ jobs:
           DOCKER_CONTENT_TRUST=1
           export CW_CCSUFFIX='-15'
           export CW_GCCSUFFIX='-12'
-          export CW_GPPSUFFIX='-11'
           docker trust inspect --pretty "${DOCKER_IMAGE}"
           time docker pull "${DOCKER_IMAGE}"
           docker images --digests
@@ -170,7 +169,6 @@ jobs:
           DOCKER_CONTENT_TRUST=1
           export CW_CCSUFFIX='-15'
           export CW_GCCSUFFIX='-12'
-          export CW_GPPSUFFIX='-11'
           docker trust inspect --pretty "${DOCKER_IMAGE}"
           time docker pull "${DOCKER_IMAGE}"
           docker images --digests
@@ -267,7 +265,6 @@ jobs:
           DOCKER_CONTENT_TRUST=1
           export CW_CCSUFFIX='-15'
           export CW_GCCSUFFIX='-12'
-          export CW_GPPSUFFIX='-11'
           docker trust inspect --pretty "${DOCKER_IMAGE}"
           time docker pull "${DOCKER_IMAGE}"
           docker images --digests
@@ -302,7 +299,6 @@ jobs:
           DOCKER_CONTENT_TRUST=1
           export CW_CCSUFFIX='-15'
           export CW_GCCSUFFIX='-12'
-          export CW_GPPSUFFIX='-11'
           docker trust inspect --pretty "${DOCKER_IMAGE}"
           time docker pull "${DOCKER_IMAGE}"
           docker images --digests

diff --git a/_ci-linux-debian.sh b/_ci-linux-debian.sh
@@ -94,13 +94,12 @@ elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
   else
     # FIXME: workaround for glibc-llvm-riscv64 builds:
     [[ "${CW_CONFIG:-}" != *'gcc'* ]] && [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=" gcc${CW_GCCSUFFIX}-riscv64-linux-gnu g++${CW_GCCSUFFIX}-riscv64-linux-gnu"
-    [ -n "${CW_GPPSUFFIX:-}" ] || CW_GPPSUFFIX='-12'
     if [ "$(uname -m)" = 'aarch64' ]; then
-      extra+=" libc6-dev-amd64-cross libstdc++${CW_GPPSUFFIX}-dev-amd64-cross"
+      extra+=" libc6-dev-amd64-cross libstdc++${CW_GCCSUFFIX}-dev:amd64"
     else
-      extra+=" libc6-dev-arm64-cross libstdc++${CW_GPPSUFFIX}-dev-arm64-cross"
+      extra+=" libc6-dev-arm64-cross libstdc++${CW_GCCSUFFIX}-dev:arm64"
     fi
-    [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=" libc6-dev-riscv64-cross libstdc++${CW_GPPSUFFIX}-dev-riscv64-cross"
+    [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=" libc6-dev-riscv64-cross libstdc++${CW_GCCSUFFIX}-dev:riscv64"
   fi
 fi