]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Use clang-20 when building hardenedmalloc for tests. master anongit/master
authorDarren Tucker <dtucker@dtucker.net>
Sat, 8 Aug 2026 11:14:57 +0000 (21:14 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Sat, 8 Aug 2026 11:23:22 +0000 (21:23 +1000)
Some versions of clang-19 report:
error: invalid feature combination:  +avx10.1-256; will be promoted to
avx10.1-512 [-Werror,-Winvalid-feature-combination]

.github/setup_ci.sh

index 2572a2882de460834a85ddef672290069dd6e6d0..8cbe9fd429cd97facd2cb5bf13ab7ff730f168ab 100755 (executable)
@@ -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