···

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
    configureFlags = [ "--release-channel=stable" ];

     

       
22
       
22
       
 
       


     

       
23
       
23
       
+
       
    # Upstream is not running tests on aarch64:

     

       
24
       
24
       
+
       
    # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567

     

       
25
       
25
       
+
       
    # So we do the same.

     

       
26
       
26
       
+
       
    doCheck = !stdenv.isAarch64;

     

       
27
       
27
       
+
       


     

       
23
       
28
       
 
       
    patches = [

     

       
24
       
29
       
 
       
      ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch

     

       
25
       
25
       
-
       
    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch

     

       
26
       
26
       
-
       
      # https://github.com/rust-lang/rust/issues/45410

     

       
27
       
27
       
-
       
      ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch;

     

       
30
       
30
       
+
       
    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

     

       
28
       
31
       
 
       


     

       
29
       
32
       
 
       
  };

     

       
30
       
33
       
 
       


     

···

       
1
       
1
       
-
       
diff --git a/src/librustc_metadata/dynamic_lib.rs b/src/librustc_metadata/dynamic_lib.rs

     

       
2
       
2
       
-
       
index 1b42fa0..92256dc 100644

     

       
3
       
3
       
-
       
--- a/src/librustc_metadata/dynamic_lib.rs

     

       
4
       
4
       
-
       
+++ b/src/librustc_metadata/dynamic_lib.rs

     

       
5
       
5
       
-
       
@@ -80,6 +80,7 @@ mod tests {

     

       
6
       
6
       
-
       
     use std::mem;

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
     #[test]

     

       
9
       
9
       
-
       
+    #[ignore]

     

       
10
       
10
       
-
       
     fn test_loading_cosine() {

     

       
11
       
11
       
-
       
         if cfg!(windows) {

     

       
12
       
12
       
-
       
             return

     

···

       
108
       
108
       
 
       


     

       
109
       
109
       
 
       
    # Useful debugging parameter

     

       
110
       
110
       
 
       
    # export VERBOSE=1

     

       
111
       
111
       
-
       
  '' + optionalString stdenv.isAarch64 ''

     

       
112
       
112
       
-
       
    # https://github.com/rust-lang/rust/issues/49807

     

       
113
       
113
       
-
       
    rm -vr src/test/debuginfo/by-value-self-argument-in-trait-impl.rs

     

       
114
       
111
       
 
       
  '' + optionalString stdenv.isDarwin ''

     

       
115
       
112
       
 
       
    # Disable all lldb tests.

     

       
116
       
113
       
 
       
    # error: Can't run LLDB test because LLDB's python path is not set