summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo M. Correia <rcorreia@wizy.org>2016-02-02 18:33:09 +0100
committerRicardo M. Correia <rcorreia@wizy.org>2016-02-02 19:51:27 +0100
commit9725e067ffff0e738e72dde462a7435591698ff8 (patch)
tree3c6ed2cd81e86c64efb8021fa8c459bf7a1262e1
parentba8b7fff6a73806c6e86573827609f80c1af0bbd (diff)
downloadnixlib-9725e067ffff0e738e72dde462a7435591698ff8.tar
nixlib-9725e067ffff0e738e72dde462a7435591698ff8.tar.gz
nixlib-9725e067ffff0e738e72dde462a7435591698ff8.tar.bz2
nixlib-9725e067ffff0e738e72dde462a7435591698ff8.tar.lz
nixlib-9725e067ffff0e738e72dde462a7435591698ff8.tar.xz
nixlib-9725e067ffff0e738e72dde462a7435591698ff8.tar.zst
nixlib-9725e067ffff0e738e72dde462a7435591698ff8.zip
rustcMaster: build against bundled LLVM
This is a workaround for what appears to be issue rust-lang/rust#30970.

Without this change, rustcMaster will fail to build the clippy library
due to linking errors against LLVM (and ncurses, for some reason).

I expect this commit to be reverted once that issue is fixed upstream.
-rw-r--r--pkgs/development/compilers/rustc/head.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 4ef521218e68..4d2039669598 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -4,7 +4,7 @@
 callPackage ./generic.nix {
   shortVersion = "2016-02-01";
   isRelease = false;
-  forceBundledLLVM = false;
+  forceBundledLLVM = true;
   srcRev = "094c5b0d6";
   srcSha = "0908xzxb4q8vqwmzi5c2vzrhfsrw7d18r4n7mq3ir5671y9cqpvz";