alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

rustc: 1.4.0 -> 1.5.0

Browse source
This commit is contained in:
Robin Gloster 2015-12-23 23:21:35 +00:00 committed by Moritz Ulrich
parent b45161fbbe
commit b26aa99d9d
4 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/compilers/rustc/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, callPackage }:
callPackage ./generic.nix {
shortVersion = "1.4.0";
shortVersion = "1.5.0";
isRelease = true;
forceBundledLLVM = false;
forceBundledLLVM = true;
configureFlags = [ "--release-channel=stable" ];
srcSha = "13wpi9nb3h6wwck2mxhza85fahzcwgas00w8m25086v34dha4dp1";
srcSha = "1vfpwx6a2f2rn528774cz9r7r82ppycn8z8ybll6bphdw7cyar1g";
/* Rust is bootstrapped from an earlier built version. We need
to fetch these earlier versions, which vary per platform.
@ -22,7 +22,6 @@ callPackage ./generic.nix {
snapshotDate = "2015-08-11";
snapshotRev = "1af31d4";
# cc-ar-opts.patch should be removable in 1.4.0+
patches = [ ./patches/remove-uneeded-git.patch ]
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
}

2
pkgs/development/compilers/rustc/head.nix
View file

@ -23,6 +23,6 @@ callPackage ./generic.nix {
snapshotRev = "1af31d4";
patches = [ ./patches/remove-uneeded-git.patch ]
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec-head.patch;
++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
}

24
pkgs/development/compilers/rustc/patches/grsec-head.patch
View file

@ -1,24 +0,0 @@
diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
index b22f34f..c6489bd 100644
--- a/src/test/run-make/relocation-model/Makefile
+++ b/src/test/run-make/relocation-model/Makefile
@@ -2,9 +2,11 @@
all: others
$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
+ paxctl -czexm $(TMPDIR)/foo
$(call RUN,foo)
$(RUSTC) -C relocation-model=default foo.rs
+ paxctl -czexm $(TMPDIR)/foo
$(call RUN,foo)
$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
@@ -16,6 +18,7 @@ others:
else
others:
$(RUSTC) -C relocation-model=static foo.rs
+ paxctl -czexm $(TMPDIR)/foo
$(call RUN,foo)
$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs
endif

16
pkgs/development/compilers/rustc/patches/grsec.patch
View file

@ -1,16 +1,24 @@
diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
index 2fcdd32..2d9ddb0 100644
index b22f34f..c6489bd 100644
--- a/src/test/run-make/relocation-model/Makefile
+++ b/src/test/run-make/relocation-model/Makefile
@@ -5,9 +5,11 @@ all:
@@ -2,9 +2,11 @@
all: others
$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
+ paxctl -czexm $(TMPDIR)/foo
$(call RUN,foo)
$(RUSTC) -C relocation-model=default foo.rs
+ paxctl -czexm $(TMPDIR)/foo
$(call RUN,foo)
$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
@@ -16,6 +18,7 @@ others:
else
others:
$(RUSTC) -C relocation-model=static foo.rs
+ paxctl -czexm $(TMPDIR)/foo
$(call RUN,foo)
$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs
endif