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

rustcMaster: Update to newer rev

Browse Source
This commit is contained in:
Ricardo M. Correia 2014-11-06 01:54:44 +01:00
parent 83e376e4bb
commit 4fc73a7873
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,33 +1,23 @@
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index 1cc60fc..2e94b99 100644 index 81f856c..c2078a5 100644
--- a/src/librustc/back/link.rs --- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs
@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri @@ -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 { pub fn get_cc_prog(sess: &Session) -> String {
match sess.opts.cg.linker { match sess.opts.cg.linker {
- Some(ref linker) => return linker.to_string(), - Some(ref linker) => return linker.to_string(),
- None => {} - None => sess.target.target.options.linker.clone(),
+ Some(ref linker) => linker.to_string(), + Some(ref linker) => linker.to_string(),
+ None => "@ccPath@".to_string() + None => "@ccPath@".to_string(),
} }
-
- // In the future, FreeBSD will use clang as default compiler.
- // It would be flexible to use cc (system's default C compiler)
- // instead of hard-coded gcc.
- // For Windows, there is no cc command, so we add a condition to make it use gcc.
- match sess.targ_cfg.os {
- abi::OsWindows => "gcc",
- _ => "cc",
- }.to_string()
} }
pub fn remove(sess: &Session, path: &Path) {
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 060dda5..fecf76b 100644 index db2f291..c7a13dc 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
@@ -53,7 +53,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>,
paths: &[&Path]) -> ProcessOutput { paths: &[&Path]) -> ProcessOutput {
let ar = match *maybe_ar_prog { let ar = match *maybe_ar_prog {
Some(ref ar) => ar.as_slice(), Some(ref ar) => ar.as_slice(),
@ -35,3 +25,4 @@ index 060dda5..fecf76b 100644
+ None => "@arPath@" + None => "@arPath@"
}; };
let mut cmd = Command::new(ar); let mut cmd = Command::new(ar);

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper { stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper
, tzdata, git , tzdata, git, valgrind
}: }:
assert stdenv.gcc.gcc != null; assert stdenv.gcc.gcc != null;
@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null;
*/ */
with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-127-ga0ea210";}); with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-961-g93c85eb";});
let snapshot = if stdenv.system == "i686-linux" let snapshot = if stdenv.system == "i686-linux"
then "0644637db852db8a6c603ded0531ccaa60291bd3" then "d827fbbd778b854923971873cf03bdb79c2e8575"
else if stdenv.system == "x86_64-linux" else if stdenv.system == "x86_64-linux"
then "656b8c23fbb97794e85973aca725a4b9cd07b29e" then "1ddca522a8ba4a4f662dc17ca16b0f50f2c15f87"
else if stdenv.system == "i686-darwin" else if stdenv.system == "i686-darwin"
then "e4d9709fcfe485fcca00f0aa1fe456e2f164ed96" then "597cd42301e1569df8ad090574cd535d19283387"
else if stdenv.system == "x86_64-darwin" else if stdenv.system == "x86_64-darwin"
then "6b1aa5a441965da87961be81950e8663eadba377" then "4bfb2aff1c3e3c57653b32adc34b399c5aeb759b"
else abort "no-snapshot for platform ${stdenv.system}"; else abort "no-snapshot for platform ${stdenv.system}";
snapshotDate = "2014-10-10"; snapshotDate = "2014-11-04";
snapshotRev = "78a7676"; snapshotRev = "1b2ad78";
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 = "a0ea210b394aa1b61d341593a3f9098fe5bf7806"; rev = "93c85eb8bdcc910a27caf6abd20207a626ae98e5";
sha256 = "0flwzj6dywaq9s77ayinshqbz8na2a1jabkr9s7zj74s2ya5096i"; sha256 = "0zj84xsyg8jpd6ixmdv7jsjrnsd4zwrac98qqmwgrd78h74g8kpq";
}; };
# 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.
@ -73,7 +73,7 @@ in stdenv.mkDerivation {
--subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"
''; '';
buildInputs = [ which file perl curl python27 makeWrapper git ]; buildInputs = [ which file perl curl python27 makeWrapper git valgrind ];
enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 enableParallelBuilding = false; # disabled due to rust-lang/rust#16305