summary refs log tree commit diff
path: root/pkgs/development/compilers/rust/rustc.nix
diff options
context:
space:
mode:
authorMoritz Ulrich <moritz@tarn-vedra.de>2016-08-10 21:13:22 +0200
committerMoritz Ulrich <moritz@tarn-vedra.de>2016-08-10 21:25:53 +0200
commit02608c6a3c70eebd7a7bcc45a21e40b8e27297b7 (patch)
treeccaf31302841215cb00f1ef1eecc85bd96327a59 /pkgs/development/compilers/rust/rustc.nix
parent3324123eb7e4ee9cab9b53c9655971430f59ec2b (diff)
downloadnixpkgs-02608c6a3c70eebd7a7bcc45a21e40b8e27297b7.tar
nixpkgs-02608c6a3c70eebd7a7bcc45a21e40b8e27297b7.tar.gz
nixpkgs-02608c6a3c70eebd7a7bcc45a21e40b8e27297b7.tar.bz2
nixpkgs-02608c6a3c70eebd7a7bcc45a21e40b8e27297b7.tar.lz
nixpkgs-02608c6a3c70eebd7a7bcc45a21e40b8e27297b7.tar.xz
nixpkgs-02608c6a3c70eebd7a7bcc45a21e40b8e27297b7.tar.zst
nixpkgs-02608c6a3c70eebd7a7bcc45a21e40b8e27297b7.zip
rustc: Disable failing linker-output-utf8 test.
Diffstat (limited to 'pkgs/development/compilers/rust/rustc.nix')
-rw-r--r--pkgs/development/compilers/rust/rustc.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 1bc001203e9..85e842176f4 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation {
                 ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
 
   patches = patches ++ targetPatches;
+
   passthru.target = target;
 
   postPatch = ''
@@ -87,6 +88,9 @@ stdenv.mkDerivation {
     #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
     #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
 
+    # Disable fragile linker-output-non-utf8 test
+    rm -vr src/test/run-make/linker-output-non-utf8/
+
     # Useful debugging parameter
     #export VERBOSE=1
   '';