diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-16 21:39:44 +0200 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-16 21:39:44 +0200 |
commit | 9e5896496cfd5da5754018887f7ad3b256b3ad80 (patch) | |
tree | d16fadfe61a00d589289f72f27718ea70d46a071 /pkgs/development/compilers/llvm/9/compiler-rt/default.nix | |
parent | cb6ec35052306d0d78fe238852394c3976608918 (diff) | |
parent | 74b74b05550f258e9055b824eff49b15637dd917 (diff) | |
download | nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.gz nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.bz2 nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.lz nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.xz nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.tar.zst nixpkgs-9e5896496cfd5da5754018887f7ad3b256b3ad80.zip |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs/development/compilers/llvm/9/compiler-rt/default.nix')
-rw-r--r-- | pkgs/development/compilers/llvm/9/compiler-rt/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix index cfc8e0ea74a..285fe811514 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { inherit version; src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"; - nativeBuildInputs = [ cmake python3 llvm ]; + nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce ../../common/compiler-rt/glibc.patch ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./gnu-install-dirs.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; |