public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustcMaster: Update from 0.12.0-pre-1166-g0047dbe -> 0.12.0-pre-1336-g394269d 

Fixes #5056
This commit is contained in:
Ricardo M. Correia 2014-11-21 01:43:40 +01:00
parent b7b956ffec
commit 855241400c
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
View File

@ -1,20 +1,5 @@
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index 81f856c..c2078a5 100644
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -361,8 +361,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
pub fn get_cc_prog(sess: &Session) -> String {
match sess.opts.cg.linker {
- Some(ref linker) => return linker.to_string(),
- None => sess.target.target.options.linker.clone(),
+ Some(ref linker) => linker.to_string(),
+ None => "@ccPath@".to_string(),
}
}
diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
index db2f291..c7a13dc 100644 index a88bcaf..9c3858d 100644
--- a/src/librustc_back/archive.rs --- a/src/librustc_back/archive.rs
+++ b/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs
@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>, @@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
@ -26,3 +11,18 @@ index db2f291..c7a13dc 100644
}; };
let mut cmd = Command::new(ar); let mut cmd = Command::new(ar);
diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
index d27a338..c9b1508 100644
--- a/src/librustc_trans/back/link.rs
+++ b/src/librustc_trans/back/link.rs
@@ -361,8 +361,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
pub fn get_cc_prog(sess: &Session) -> String {
match sess.opts.cg.linker {
- Some(ref linker) => return linker.to_string(),
- None => sess.target.target.options.linker.clone(),
+ Some(ref linker) => linker.to_string(),
+ None => "@ccPath@".to_string(),
}
}

20
pkgs/development/compilers/rustc/head.nix
View File

@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null;
*/ */
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1166-g0047dbe";}); with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1336-g394269d";});
let snapshot = if stdenv.system == "i686-linux" let snapshot = if stdenv.system == "i686-linux"
then "3f8bb33f86800affca3cb7245925c19b28a94498" then "999ba4a0dfb70adca628138a7d5f491023621140"
else if stdenv.system == "x86_64-linux" else if stdenv.system == "x86_64-linux"
then "e0e13a4312bea0bcc7db35b46bcce957178b18a4" then "55eaaed3bd6dd5a8d08e99aa4cd618d207f87d8c"
else if stdenv.system == "i686-darwin" else if stdenv.system == "i686-darwin"
then "22f084aaecb773e8348c64fb9ac6d5eba363eb56" then "0581dff21a238343602ec0202a551bac93d21300"
else if stdenv.system == "x86_64-darwin" else if stdenv.system == "x86_64-darwin"
then "c8554badab19cee96fbf51c2b98ee1bba87caa5c" then "aad290cf3f8ac4aa0661984a9799c78161ea5a72"
else abort "no-snapshot for platform ${stdenv.system}"; else abort "no-snapshot for platform ${stdenv.system}";
snapshotDate = "2014-11-10"; snapshotDate = "2014-11-18";
snapshotRev = "f89e975"; snapshotRev = "9c96a79";
snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -40,8 +40,8 @@ in stdenv.mkDerivation {
src = fetchgit { src = fetchgit {
url = https://github.com/rust-lang/rust; url = https://github.com/rust-lang/rust;
rev = "0047dbe59c41b951d34ce6324f3a8c0e15d523e9"; rev = "394269d16e3752a23ffa273e68f8aaefd2a510c4";
sha256 = "1w22w5rfpw0kcmnrrmrxslsxyl4xhyckcxgwmv3hbir05qxsxm6m"; sha256 = "0zkz5f4gba4glhrf9f7v42qxk638q9ahgf6m0bjh8b7c3x52cv71";
}; };
# We need rust to build rust. If we don't provide it, configure will try to download it. # We need rust to build rust. If we don't provide it, configure will try to download it.
@ -69,7 +69,7 @@ in stdenv.mkDerivation {
++ stdenv.lib.optional stdenv.needsPax ./grsec.HEAD.patch; ++ stdenv.lib.optional stdenv.needsPax ./grsec.HEAD.patch;
postPatch = '' postPatch = ''
substituteInPlace src/librustc/back/link.rs \ substituteInPlace src/librustc_trans/back/link.rs \
--subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"
substituteInPlace src/librustc_back/archive.rs \ substituteInPlace src/librustc_back/archive.rs \
--subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"