···

       
1
       
1
       
 
       
{ stdenv, callPackage }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
callPackage ./generic.nix {

     

       
4
       
4
       
-
       
  shortVersion = "1.4.0";

     

       
4
       
4
       
+
       
  shortVersion = "1.5.0";

     

       
5
       
5
       
 
       
  isRelease = true;

     

       
6
       
6
       
-
       
  forceBundledLLVM = false;

     

       
6
       
6
       
+
       
  forceBundledLLVM = true;

     

       
7
       
7
       
 
       
  configureFlags = [ "--release-channel=stable" ];

     

       
8
       
8
       
-
       
  srcSha = "13wpi9nb3h6wwck2mxhza85fahzcwgas00w8m25086v34dha4dp1";

     

       
8
       
8
       
+
       
  srcSha = "1vfpwx6a2f2rn528774cz9r7r82ppycn8z8ybll6bphdw7cyar1g";

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
  /* Rust is bootstrapped from an earlier built version. We need

     

       
11
       
11
       
 
       
  to fetch these earlier versions, which vary per platform.

     
···

       
22
       
22
       
 
       
  snapshotDate = "2015-08-11";

     

       
23
       
23
       
 
       
  snapshotRev = "1af31d4";

     

       
24
       
24
       
 
       


     

       
25
       
25
       
-
       
  # cc-ar-opts.patch should be removable in 1.4.0+

     

       
26
       
25
       
 
       
  patches = [ ./patches/remove-uneeded-git.patch ]

     

       
27
       
26
       
 
       
    ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

     

       
28
       
27
       
 
       
}

     

···

       
23
       
23
       
 
       
  snapshotRev = "1af31d4";

     

       
24
       
24
       
 
       


     

       
25
       
25
       
 
       
  patches = [ ./patches/remove-uneeded-git.patch ]

     

       
26
       
26
       
-
       
    ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec-head.patch;

     

       
26
       
26
       
+
       
    ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

     

       
27
       
27
       
 
       
}

     

       
28
       
28
       
 
       


     

···

       
1
       
1
       
-
       
diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile

     

       
2
       
2
       
-
       
index b22f34f..c6489bd 100644

     

       
3
       
3
       
-
       
--- a/src/test/run-make/relocation-model/Makefile

     

       
4
       
4
       
-
       
+++ b/src/test/run-make/relocation-model/Makefile

     

       
5
       
5
       
-
       
@@ -2,9 +2,11 @@

     

       
6
       
6
       
-
       
 

     

       
7
       
7
       
-
       
 all: others

     

       
8
       
8
       
-
       
 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs

     

       
9
       
9
       
-
       
+	paxctl -czexm $(TMPDIR)/foo

     

       
10
       
10
       
-
       
 	$(call RUN,foo)

     

       
11
       
11
       
-
       
 

     

       
12
       
12
       
-
       
 	$(RUSTC) -C relocation-model=default foo.rs

     

       
13
       
13
       
-
       
+	paxctl -czexm $(TMPDIR)/foo

     

       
14
       
14
       
-
       
 	$(call RUN,foo)

     

       
15
       
15
       
-
       
 

     

       
16
       
16
       
-
       
 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs

     

       
17
       
17
       
-
       
@@ -16,6 +18,7 @@ others:

     

       
18
       
18
       
-
       
 else

     

       
19
       
19
       
-
       
 others:

     

       
20
       
20
       
-
       
 	$(RUSTC) -C relocation-model=static foo.rs

     

       
21
       
21
       
-
       
+	paxctl -czexm $(TMPDIR)/foo

     

       
22
       
22
       
-
       
 	$(call RUN,foo)

     

       
23
       
23
       
-
       
 	$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs

     

       
24
       
24
       
-
       
 endif

     

···

       
1
       
1
       
 
       
diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile

     

       
2
       
2
       
-
       
index 2fcdd32..2d9ddb0 100644

     

       
2
       
2
       
+
       
index b22f34f..c6489bd 100644

     

       
3
       
3
       
 
       
--- a/src/test/run-make/relocation-model/Makefile

     

       
4
       
4
       
 
       
+++ b/src/test/run-make/relocation-model/Makefile

     

       
5
       
5
       
-
       
@@ -5,9 +5,11 @@ all:

     

       
5
       
5
       
+
       
@@ -2,9 +2,11 @@

     

       
6
       
6
       
+
       
 

     

       
7
       
7
       
+
       
 all: others

     

       
8
       
8
       
+
       
 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs

     

       
9
       
9
       
+
       
+	paxctl -czexm $(TMPDIR)/foo

     

       
6
       
10
       
 
       
 	$(call RUN,foo)

     

       
7
       
11
       
 
       
 

     

       
8
       
12
       
 
       
 	$(RUSTC) -C relocation-model=default foo.rs

     

       
9
       
13
       
 
       
+	paxctl -czexm $(TMPDIR)/foo

     

       
10
       
14
       
 
       
 	$(call RUN,foo)

     

       
11
       
15
       
 
       
 

     

       
16
       
16
       
+
       
 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs

     

       
17
       
17
       
+
       
@@ -16,6 +18,7 @@ others:

     

       
18
       
18
       
+
       
 else

     

       
19
       
19
       
+
       
 others:

     

       
12
       
20
       
 
       
 	$(RUSTC) -C relocation-model=static foo.rs

     

       
13
       
21
       
 
       
+	paxctl -czexm $(TMPDIR)/foo

     

       
14
       
22
       
 
       
 	$(call RUN,foo)

     

       
15
       
15
       
-
       
 

     

       
16
       
16
       
-
       
 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs

     

       
23
       
23
       
+
       
 	$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs

     

       
24
       
24
       
+
       
 endif