diff options
| author | Luka Blaskovic <lblasc@znode.net> | 2019-01-22 08:06:36 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 18:24:54 +0100 |
| commit | 0ae0273803934f10396a65fc0cd6b50566936602 (patch) | |
| tree | b5e143139ab22eec8963f9fabebbf390b4ee845e | |
| parent | 75df522844578a6523e876f35f2fee0167960be9 (diff) | |
| download | nixlib-0ae0273803934f10396a65fc0cd6b50566936602.tar nixlib-0ae0273803934f10396a65fc0cd6b50566936602.tar.gz nixlib-0ae0273803934f10396a65fc0cd6b50566936602.tar.bz2 nixlib-0ae0273803934f10396a65fc0cd6b50566936602.tar.lz nixlib-0ae0273803934f10396a65fc0cd6b50566936602.tar.xz nixlib-0ae0273803934f10396a65fc0cd6b50566936602.tar.zst nixlib-0ae0273803934f10396a65fc0cd6b50566936602.zip | |
llvm7: backport patches, fix building rust crates with lto
See: https://github.com/rust-lang/rust/issues/57762 (cherry picked from commit c340704bd3a7784e2d5dd806ee528a243dea9172)
| -rw-r--r-- | pkgs/development/compilers/llvm/7/llvm.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 5800e7f021cd..5bb629931fd5 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -54,6 +54,15 @@ in stdenv.mkDerivation (rec { url = "https://github.com/llvm-mirror/llvm/commit/57567def148f387153a8149fb590bd39b1b006a1.patch"; sha256 = "1w1xg5pxpc6cals1nf5j5k4p6qi8lcrpvn0paxc86m415i79xmcg"; }) + # backport, fix building rust crates with lto + (fetchpatch { + url = "https://github.com/llvm-mirror/llvm/commit/da1fb72bb305d6bc1f3899d541414146934bf80f.patch"; + sha256 = "0p81gkhc1xhcx0hmnkwyhrn8x8l8fd24xgaj1whni29yga466dwc"; + }) + (fetchpatch { + url = "https://github.com/llvm-mirror/llvm/commit/cc1f2a595ead516812a6c50398f0f3480ebe031f.patch"; + sha256 = "0k6k1p5yisgwx417a67s7sr9930rqh1n0zv5jvply8vjjy4b3kf8"; + }) ]; postPatch = optionalString stdenv.isDarwin '' |