diff --git a/_ci-linux-debian.sh b/_ci-linux-debian.sh
index 921f7dc34..f7fec9fad 100755
--- a/_ci-linux-debian.sh
+++ b/_ci-linux-debian.sh
@@ -95,11 +95,19 @@ elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
     # 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"
     if [ "$(uname -m)" = 'aarch64' ]; then
-      extra+=" libc6-dev-amd64-cross libstdc++${CW_GCCSUFFIX}-dev:amd64"
+      extra+=" libc6-dev-amd64-cross"
     else
-      extra+=" libc6-dev-arm64-cross libstdc++${CW_GCCSUFFIX}-dev:arm64"
+      extra+=" libc6-dev-arm64-cross"
     fi
-    [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=" libc6-dev-riscv64-cross libstdc++${CW_GCCSUFFIX}-dev:riscv64"
+    [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=" libc6-dev-riscv64-cross"
+  fi
+  if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
+    if [ "$(uname -m)" = 'aarch64' ]; then
+      extra+=" libstdc++${CW_GCCSUFFIX}-dev:amd64"
+    else
+      extra+=" libstdc++${CW_GCCSUFFIX}-dev:arm64"
+    fi
+    [[ "${CW_CONFIG:-}" = *'r64'* ]] && extra+=" libstdc++${CW_GCCSUFFIX}-dev:riscv64"
   fi
 fi