From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 8 Aug 2026 11:14:57 +0000 (+1000)
Subject: Use clang-20 when building hardenedmalloc for tests.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;p=thirdparty%2Fopenssh-portable.git

Use clang-20 when building hardenedmalloc for tests.

Some versions of clang-19 report:
error: invalid feature combination:  +avx10.1-256; will be promoted to
avx10.1-512 [-Werror,-Winvalid-feature-combination]
---

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 2572a2882..8cbe9fd42 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -147,8 +147,8 @@ for TARGET in $TARGETS; do
 	;;
     hardenedmalloc)
 	INSTALL_HARDENED_MALLOC=yes
-	# Need clang >= 19 for constexpr.
-	PACKAGES="$PACKAGES clang-19"
+	# Need clang >= 19 for constexpr and >= 20 for avx10.1-512
+	PACKAGES="$PACKAGES clang-20"
 	;;
     musl)
 	PACKAGES="$PACKAGES musl-tools"
@@ -243,7 +243,8 @@ if [ "${INSTALL_HARDENED_MALLOC}" = "yes" ]; then
     (cd ${HOME} &&
      git clone https://github.com/GrapheneOS/hardened_malloc.git &&
      cd ${HOME}/hardened_malloc &&
-     make CC=clang-19 && sudo cp out/libhardened_malloc.so /usr/lib/)
+     clang-20 --version &&
+     make CC=clang-20 && sudo cp out/libhardened_malloc.so /usr/lib/)
 fi
 
 if [ ! -z "${INSTALL_OPENSSL}" ]; then