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

rustcMaster: 2015-07-01 -> 2015-07-28

Browse Source
This commit is contained in:
Ricardo M. Correia 2015-07-29 13:21:38 +02:00
parent d202f0c625
commit 21579ef5d0
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,16 @@
{ stdenv, callPackage }: { stdenv, callPackage }:
callPackage ./generic.nix { callPackage ./generic.nix {
shortVersion = "2015-07-01"; shortVersion = "2015-07-28";
isRelease = false; isRelease = false;
# src rev for master on 2015-07-01 # src rev for 2015-07-28's nightly channel
srcRev = "bf3c979ec"; srcRev = "8b835572b";
srcSha = "1xp2fjffz5bwxfs37w80bdhy9lv091ps7xbnsvxid2i91rbxfrkk"; srcSha = "1qrw0vszr1zipsbp7gcm8kik73d2bfxwv6mniv81ygn9i7v76wfz";
snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b"; snapshotHashLinux686 = "93f6216a35d3bed3cedf244c9aff4cd716336bd9";
snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c"; snapshotHashLinux64 = "d8f4967fc71a153c925faecf95a7feadf7e463a4";
snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f"; snapshotHashDarwin686 = "29852c4d4b5a851f16d627856a279cae5bf9bd01";
snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae"; snapshotHashDarwin64 = "1a20259899321062a0325edb1d22990f05d18708";
snapshotDate = "2015-05-24"; snapshotDate = "2015-07-17";
snapshotRev = "ba0e1cd"; snapshotRev = "d4432b3";
patches = [ patches = [
./patches/head.patch ./patches/head.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

6
pkgs/development/compilers/rustc/patches/head.patch
View File

@ -1,11 +1,11 @@
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
index a42f861..bda4bde 100644 index 39e4291..b352bd1 100644
--- a/src/librustc_back/target/mod.rs --- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs
@@ -172,8 +172,8 @@ impl Default for TargetOptions { @@ -179,8 +179,8 @@ impl Default for TargetOptions {
/// incomplete, and if used for compilation, will certainly not work.
fn default() -> TargetOptions { fn default() -> TargetOptions {
TargetOptions { TargetOptions {
data_layout: String::new(),
- linker: "cc".to_string(), - linker: "cc".to_string(),
- ar: "ar".to_string(), - ar: "ar".to_string(),
+ linker: "@ccPath@".to_string(), // ignore-tidy-linelength + linker: "@ccPath@".to_string(), // ignore-tidy-linelength