rustcMaster: Update from 0.13.0-pre-2604-g2f3cff6 -> 0.13.0-pre-2763-g6366631
This commit is contained in:
parent
0f05b01dce
commit
24bb7dc46f
|
@ -1,21 +1,21 @@
|
|||
diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
|
||||
index a88bcaf..9c3858d 100644
|
||||
index 0bd4265..bbdab9b 100644
|
||||
--- a/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>,
|
||||
paths: &[&Path]) -> ProcessOutput {
|
||||
let ar = match *maybe_ar_prog {
|
||||
Some(ref ar) => ar.as_slice(),
|
||||
Some(ref ar) => ar[],
|
||||
- None => "ar"
|
||||
+ None => "@arPath@"
|
||||
};
|
||||
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
|
||||
index ec61d3a..8252939 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
|
||||
@@ -346,8 +346,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 {
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
*/
|
||||
|
||||
with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-2604-g2f3cff6";});
|
||||
with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-2763-g6366631";});
|
||||
|
||||
let snapshot = if stdenv.system == "i686-linux"
|
||||
then "3daf531aed03f5769402f2fef852377e2838db98"
|
||||
|
@ -38,8 +38,8 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchgit {
|
||||
url = https://github.com/rust-lang/rust;
|
||||
rev = "2f3cff6956d56048ef7afb6d33e17cbdb2dcf038";
|
||||
sha256 = "113y74sd1gr7f0xs1lsgjw3jkvhz8s4dxx34r9cxlw5vjr7fp066";
|
||||
rev = "63666317214788329e0b7680929b09823f127d83";
|
||||
sha256 = "1saf6ycy5dzp1bxypzqisi4g4p0y1czbgr82xbrw5c81x5c274zk";
|
||||
};
|
||||
|
||||
# We need rust to build rust. If we don't provide it, configure will try to download it.
|
||||
|
|
Loading…
Reference in a new issue