llvmPackages_{12,13,14,15,16,17,18,19,20,git}.libunwind: move patches out of common
This commit is contained in:
committed by
Alyssa Ross
parent
20e4f33f16
commit
1a148262f4
@@ -1086,9 +1086,6 @@ let
|
||||
);
|
||||
|
||||
libunwind = callPackage ./libunwind {
|
||||
patches = lib.optional (lib.versionOlder metadata.release_version "17") (
|
||||
metadata.getVersionFile "libunwind/gnu-install-dirs.patch"
|
||||
);
|
||||
stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, release_version
|
||||
, patches ? []
|
||||
, src ? null
|
||||
, llvm_meta
|
||||
, version
|
||||
@@ -13,6 +12,7 @@
|
||||
, libcxx
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
, devExtraCmakeFlags ? []
|
||||
, getVersionFile
|
||||
}:
|
||||
let
|
||||
pname = "libunwind";
|
||||
@@ -33,6 +33,10 @@ let
|
||||
cp -r ${monorepoSrc}/runtimes "$out"
|
||||
'') else src;
|
||||
|
||||
patches = lib.optional (lib.versionOlder release_version "17") (
|
||||
getVersionFile "libunwind/gnu-install-dirs.patch"
|
||||
);
|
||||
|
||||
hasPatches = builtins.length patches > 0;
|
||||
|
||||
prePatch = lib.optionalString (lib.versionAtLeast release_version "15" && (hasPatches || lib.versionOlder release_version "18")) ''
|
||||
|
||||
Reference in New Issue
Block a user