Commit c3c8a4a0 authored by Emily's avatar Emily
Browse files

llvmPackages: remove obsolete version conditionals

parent f7444c37

pkgs/development/compilers/llvm/common/clang/default.nix

+3 −8
Original line number Diff line number Diff line
@@ -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)

          || !(

pkgs/development/compilers/llvm/common/common-let.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

  };

pkgs/development/compilers/llvm/common/lldb/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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" ];

pkgs/development/compilers/llvm/common/llvm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

          (