diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 90fc14a97712..19ac46ab8f71 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -282,15 +282,10 @@ stdenv.mkDerivation ( hardeningUnsupportedFlagsByTargetPlatform = targetPlatform: [ "fortify3" ] + ++ lib.optional (!targetPlatform.isLinux || !targetPlatform.isx86_64) "shadowstack" + ++ lib.optional (!targetPlatform.isAarch64 || !targetPlatform.isLinux) "pacret" ++ lib.optional ( - (lib.versionOlder release_version "7") || !targetPlatform.isLinux || !targetPlatform.isx86_64 - ) "shadowstack" - ++ lib.optional ( - (lib.versionOlder release_version "8") || !targetPlatform.isAarch64 || !targetPlatform.isLinux - ) "pacret" - ++ lib.optional ( - (lib.versionOlder release_version "11") - || (targetPlatform.isAarch64 && (lib.versionOlder release_version "18.1")) + (targetPlatform.isAarch64 && (lib.versionOlder release_version "18.1")) || (targetPlatform.isFreeBSD && (lib.versionOlder release_version "15")) || !(targetPlatform.isLinux || targetPlatform.isFreeBSD) || !( diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index 1a17e39a0690..6c4f3d5604b5 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -31,7 +31,7 @@ rec { ++ lib.platforms.s390x ++ lib.platforms.wasi ++ lib.platforms.x86 - ++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv + ++ lib.platforms.riscv ++ lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k ++ lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64; }; diff --git a/pkgs/development/compilers/llvm/common/lldb/default.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix index c470536bc935..5de0fec60877 100644 --- a/pkgs/development/compilers/llvm/common/lldb/default.nix +++ b/pkgs/development/compilers/llvm/common/lldb/default.nix @@ -258,7 +258,7 @@ stdenv.mkDerivation ( pname = "lldb-manpages"; buildPhase = lib.optionalString (lib.versionOlder release_version "15") '' - make ${if (lib.versionOlder release_version "12") then "docs-man" else "docs-lldb-man"} + make docs-lldb-man ''; ninjaFlags = lib.optionals (lib.versionAtLeast release_version "15") [ "docs-lldb-man" ]; diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index e7b2abfd83ed..daf88e25b34e 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation ( } ) ++ - lib.optional (lib.versionAtLeast release_version "12" && lib.versionOlder release_version "19") + lib.optional (lib.versionOlder release_version "19") # Add missing include headers to build against gcc-15: # https://github.com/llvm/llvm-project/pull/101761 (