From bf224aefe90eb756196562e13adaf9898b3b9631 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 2 Apr 2026 19:08:52 -0400 Subject: [PATCH] llvm: fix version >=20 on armv6l We were removing a test that failed on armv6l. In LLVM 20, this test was moved to a different directory, causing the build to fail. It is not clear if the test still needs to be removed after this reorganization, and I don't have hardware that can do a native armv6l build of LLVM. --- .../compilers/llvm/common/llvm/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index dc105d0e51f1..d5dcd4d58cce 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -351,10 +351,13 @@ stdenv.mkDerivation ( rm test/tools/llvm-objcopy/MachO/universal-object.test '' + - # Seems to require certain floating point hardware (NEON?) - optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - rm test/ExecutionEngine/frem.ll - '' + # Seems to require certain floating point hardware (NEON?). Tests were + # reorganized in LLVM 20. + optionalString + (stdenv.hostPlatform.system == "armv6l-linux" && lib.versionOlder release_version "20") + '' + rm test/ExecutionEngine/frem.ll + '' + # 1. TODO: Why does this test fail on FreeBSD? # It seems to reference /usr/local/lib/libfile.a, which is clearly a problem.