summary refs log tree commit diff
path: root/pkgs/development/compilers/rustc/patches/grsec.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/compilers/rustc/patches/grsec.patch')
-rw-r--r--pkgs/development/compilers/rustc/patches/grsec.patch16
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/compilers/rustc/patches/grsec.patch b/pkgs/development/compilers/rustc/patches/grsec.patch
index 84582ab7d70..b97b40c2409 100644
--- a/pkgs/development/compilers/rustc/patches/grsec.patch
+++ b/pkgs/development/compilers/rustc/patches/grsec.patch
@@ -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