···

       
1
       
 
       
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs

     

       
2
       
-
       
index 7a3e912..ced75fa 100644

     

       
3
       
 
       
--- a/src/librustc/back/link.rs

     

       
4
       
 
       
+++ b/src/librustc/back/link.rs

     

       
5
       
-
       
@@ -856,24 +856,15 @@

     

       
6
       
 
       
 

     

       
7
       
 
       
 pub fn get_cc_prog(sess: &Session) -> String {

     

       
8
       
 
       
     match sess.opts.cg.linker {

     
···

       
22
       
 
       
-    }.to_string()

     

       
23
       
 
       
 }

     

       
24
       
 
       
 

     

       
25
       
-
       
 pub fn get_ar_prog(sess: &Session) -> String {

     

       
26
       
-
       
     match sess.opts.cg.ar {

     

       
27
       
-
       
         Some(ref ar) => (*ar).clone(),

     

       
28
       
-
       
-        None => "ar".to_string()

     

       
29
       
-
       
+        None => "@arPath@".to_string()

     

       
30
       
-
       
     }

     

       
31
       
-
       
 }

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
32
       
 
       
 

     

···

       
1
       
 
       
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs

     

       
2
       
+
       
index 6332485..9500a23 100644

     

       
3
       
 
       
--- a/src/librustc/back/link.rs

     

       
4
       
 
       
+++ b/src/librustc/back/link.rs

     

       
5
       
+
       
@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri

     

       
6
       
 
       
 

     

       
7
       
 
       
 pub fn get_cc_prog(sess: &Session) -> String {

     

       
8
       
 
       
     match sess.opts.cg.linker {

     
···

       
22
       
 
       
-    }.to_string()

     

       
23
       
 
       
 }

     

       
24
       
 
       
 

     

       
25
       
+
       
 pub fn remove(sess: &Session, path: &Path) {

     

       
26
       
+
       
diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs

     

       
27
       
+
       
index 060dda5..fecf76b 100644

     

       
28
       
+
       
--- a/src/librustc_back/archive.rs

     

       
29
       
+
       
+++ b/src/librustc_back/archive.rs

     

       
30
       
+
       
@@ -53,7 +53,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,

     

       
31
       
+
       
           paths: &[&Path]) -> ProcessOutput {

     

       
32
       
+
       
     let ar = match *maybe_ar_prog {

     

       
33
       
+
       
         Some(ref ar) => ar.as_slice(),

     

       
34
       
+
       
-        None => "ar"

     

       
35
       
+
       
+        None => "@arPath@"

     

       
36
       
+
       
     };

     

       
37
       
+
       
     let mut cmd = Command::new(ar);

     

       
38
       
 
       
 

     

···

       
16
       
 
       


     

       
17
       
 
       
*/

     

       
18
       
 
       


     

       
19
       
-
       
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-79a5448f4"; });

     

       
20
       
 
       


     

       
21
       
 
       
let snapshot = if stdenv.system == "i686-linux"

     

       
22
       
-
       
      then "6f5464c9ab191d93bfea0894ca7c6f90c3506f2b"

     

       
23
       
 
       
      else if stdenv.system == "x86_64-linux"

     

       
24
       
-
       
      then "72c92895fa9a1dba7880073f2b2b5d0e3e1a2ab6"

     

       
25
       
 
       
      else if stdenv.system == "i686-darwin"

     

       
26
       
-
       
      then "545fc45a0071142714639c6be377e6d308c3a4e1"

     

       
27
       
 
       
      else if stdenv.system == "x86_64-darwin"

     

       
28
       
-
       
      then "8b44fbbbd1ba519d2e83d0d5ce1f6053d3cab8c6"

     

       
29
       
 
       
      else abort "no-snapshot for platform ${stdenv.system}";

     

       
30
       
-
       
    snapshotDate = "2014-09-10";

     

       
31
       
-
       
    snapshotRev = "6faa4f3";

     

       
32
       
 
       
    snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2";

     

       
33
       
 
       


     

       
34
       
 
       
in stdenv.mkDerivation {

     
···

       
38
       
 
       


     

       
39
       
 
       
  src = fetchgit {

     

       
40
       
 
       
    url = https://github.com/rust-lang/rust;

     

       
41
       
-
       
    rev = "79a5448f41dcc6ab52663105a6b02fc5af4c503e";

     

       
42
       
-
       
    sha256 = "0v2ahwgb1ls3g4ch6005azjmfh8bs0v0nbmmfpn53zgiiywad2ji";

     

       
43
       
 
       
  };

     

       
44
       
 
       


     

       
45
       
 
       
  # We need rust to build rust. If we don't provide it, configure will try to download it.

     
···

       
66
       
 
       
  patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ];

     

       
67
       
 
       
  postPatch = ''

     

       
68
       
 
       
    substituteInPlace src/librustc/back/link.rs \

     

       
69
       
-
       
      --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \

     

       
0
       
 
       

     

       
70
       
 
       
      --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"

     

       
71
       
 
       
  '';

     

       
72
       
 
       


     

···

       
16
       
 
       


     

       
17
       
 
       
*/

     

       
18
       
 
       


     

       
19
       
+
       
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-7fbbfe6bf"; });

     

       
20
       
 
       


     

       
21
       
 
       
let snapshot = if stdenv.system == "i686-linux"

     

       
22
       
+
       
      then "5c2132b65f45c21b43d28de6a9460978b1a7b08a"

     

       
23
       
 
       
      else if stdenv.system == "x86_64-linux"

     

       
24
       
+
       
      then "152be582853c2cf1ddcc88b085153b52ebbeb065"

     

       
25
       
 
       
      else if stdenv.system == "i686-darwin"

     

       
26
       
+
       
      then "7adbb076aeae8e1d9bdf3fe968bc7ef8a8fe0096"

     

       
27
       
 
       
      else if stdenv.system == "x86_64-darwin"

     

       
28
       
+
       
      then "152be582853c2cf1ddcc88b085153b52ebbeb065"

     

       
29
       
 
       
      else abort "no-snapshot for platform ${stdenv.system}";

     

       
30
       
+
       
    snapshotDate = "2014-09-22";

     

       
31
       
+
       
    snapshotRev = "437179e";

     

       
32
       
 
       
    snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2";

     

       
33
       
 
       


     

       
34
       
 
       
in stdenv.mkDerivation {

     
···

       
38
       
 
       


     

       
39
       
 
       
  src = fetchgit {

     

       
40
       
 
       
    url = https://github.com/rust-lang/rust;

     

       
41
       
+
       
    rev = "9a68da7401d9bef645a8b6a4e0ce4cae12604df4";

     

       
42
       
+
       
    sha256 = "1nrmahz9scv06v8pyfgjl902dh9947irpqi78lh11r5lyixia8ci";

     

       
43
       
 
       
  };

     

       
44
       
 
       


     

       
45
       
 
       
  # We need rust to build rust. If we don't provide it, configure will try to download it.

     
···

       
66
       
 
       
  patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ];

     

       
67
       
 
       
  postPatch = ''

     

       
68
       
 
       
    substituteInPlace src/librustc/back/link.rs \

     

       
69
       
+
       
      --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"

     

       
70
       
+
       
    substituteInPlace src/librustc_back/archive.rs \

     

       
71
       
 
       
      --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"

     

       
72
       
 
       
  '';

     

       
73