From 8408b91e8dae5b31807f43da351b3271316fb165 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 12 Oct 2024 18:31:24 +0200 Subject: [PATCH] llvmPackages_12.compiler-rt: move codesign patch into versioned dir All LLVM versions < 12 have been removed, so this patch can live in the versioned directory, simplifying the patch list in the process. --- .../compiler-rt/codesign.patch} | 0 pkgs/development/compilers/llvm/common/default.nix | 10 +++------- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/development/compilers/llvm/{common/compiler-rt/7-12-codesign.patch => 12/compiler-rt/codesign.patch} (100%) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/7-12-codesign.patch b/pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch similarity index 100% rename from pkgs/development/compilers/llvm/common/compiler-rt/7-12-codesign.patch rename to pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 5264dd05f012..8349e506c666 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -1002,13 +1002,9 @@ let ); compiler-rtPatches = - lib.optionals (lib.versions.major metadata.release_version == "12") [ - # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/7-12-codesign.patch - ] - ++ lib.optional ( - lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "15" - ) (metadata.getVersionFile "compiler-rt/codesign.patch") # Revert compiler-rt commit that makes codesign mandatory + lib.optional (lib.versionOlder metadata.release_version "15") ( + metadata.getVersionFile "compiler-rt/codesign.patch" + ) # Revert compiler-rt commit that makes codesign mandatory ++ [ (metadata.getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config ]