···

       
1
       
1
       
 
       
{ stdenv, callPackage }:

     

       
2
       
2
       
 
       
callPackage ./generic.nix {

     

       
3
       
3
       
-
       
  shortVersion = "2015-07-01";

     

       
3
       
3
       
+
       
  shortVersion = "2015-07-28";

     

       
4
       
4
       
 
       
  isRelease = false;

     

       
5
       
5
       
-
       
  # src rev for master on 2015-07-01

     

       
6
       
6
       
-
       
  srcRev = "bf3c979ec";

     

       
7
       
7
       
-
       
  srcSha = "1xp2fjffz5bwxfs37w80bdhy9lv091ps7xbnsvxid2i91rbxfrkk";

     

       
8
       
8
       
-
       
  snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b";

     

       
9
       
9
       
-
       
  snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c";

     

       
10
       
10
       
-
       
  snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f";

     

       
11
       
11
       
-
       
  snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae";

     

       
12
       
12
       
-
       
  snapshotDate = "2015-05-24";

     

       
13
       
13
       
-
       
  snapshotRev = "ba0e1cd";

     

       
5
       
5
       
+
       
  # src rev for 2015-07-28's nightly channel

     

       
6
       
6
       
+
       
  srcRev = "8b835572b";

     

       
7
       
7
       
+
       
  srcSha = "1qrw0vszr1zipsbp7gcm8kik73d2bfxwv6mniv81ygn9i7v76wfz";

     

       
8
       
8
       
+
       
  snapshotHashLinux686 = "93f6216a35d3bed3cedf244c9aff4cd716336bd9";

     

       
9
       
9
       
+
       
  snapshotHashLinux64 = "d8f4967fc71a153c925faecf95a7feadf7e463a4";

     

       
10
       
10
       
+
       
  snapshotHashDarwin686 = "29852c4d4b5a851f16d627856a279cae5bf9bd01";

     

       
11
       
11
       
+
       
  snapshotHashDarwin64 = "1a20259899321062a0325edb1d22990f05d18708";

     

       
12
       
12
       
+
       
  snapshotDate = "2015-07-17";

     

       
13
       
13
       
+
       
  snapshotRev = "d4432b3";

     

       
14
       
14
       
 
       
  patches = [

     

       
15
       
15
       
 
       
    ./patches/head.patch

     

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

     

···

       
1
       
1
       
 
       
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs

     

       
2
       
2
       
-
       
index a42f861..bda4bde 100644

     

       
2
       
2
       
+
       
index 39e4291..b352bd1 100644

     

       
3
       
3
       
 
       
--- a/src/librustc_back/target/mod.rs

     

       
4
       
4
       
 
       
+++ b/src/librustc_back/target/mod.rs

     

       
5
       
5
       
-
       
@@ -172,8 +172,8 @@ impl Default for TargetOptions {

     

       
6
       
6
       
-
       
     /// incomplete, and if used for compilation, will certainly not work.

     

       
5
       
5
       
+
       
@@ -179,8 +179,8 @@ impl Default for TargetOptions {

     

       
7
       
6
       
 
       
     fn default() -> TargetOptions {

     

       
8
       
7
       
 
       
         TargetOptions {

     

       
8
       
8
       
+
       
             data_layout: String::new(),

     

       
9
       
9
       
 
       
-            linker: "cc".to_string(),

     

       
10
       
10
       
 
       
-            ar: "ar".to_string(),

     

       
11
       
11
       
 
       
+            linker: "@ccPath@".to_string(), // ignore-tidy-linelength