mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
rustcMaster: Fix test failure under grsec kernels
This commit is contained in:
parent
4fc73a7873
commit
12a19684c7
2 changed files with 19 additions and 1 deletions
16
pkgs/development/compilers/rustc/grsec.HEAD.patch
Normal file
16
pkgs/development/compilers/rustc/grsec.HEAD.patch
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
|
||||||
|
index 2fcdd32..2d9ddb0 100644
|
||||||
|
--- a/src/test/run-make/relocation-model/Makefile
|
||||||
|
+++ b/src/test/run-make/relocation-model/Makefile
|
||||||
|
@@ -5,9 +5,11 @@ all:
|
||||||
|
$(call RUN,foo)
|
||||||
|
|
||||||
|
$(RUSTC) -C relocation-model=default foo.rs
|
||||||
|
+ paxctl -czexm $(TMPDIR)/foo
|
||||||
|
$(call RUN,foo)
|
||||||
|
|
||||||
|
$(RUSTC) -C relocation-model=static foo.rs
|
||||||
|
+ paxctl -czexm $(TMPDIR)/foo
|
||||||
|
$(call RUN,foo)
|
||||||
|
|
||||||
|
$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
|
|
@ -65,7 +65,9 @@ in stdenv.mkDerivation {
|
||||||
configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ];
|
configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ];
|
||||||
|
|
||||||
# The compiler requires cc, so we patch the source to tell it where to find it
|
# The compiler requires cc, so we patch the source to tell it where to find it
|
||||||
patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ];
|
patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ]
|
||||||
|
++ stdenv.lib.optional stdenv.needsPax ./grsec.HEAD.patch;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/librustc/back/link.rs \
|
substituteInPlace src/librustc/back/link.rs \
|
||||||
--subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"
|
--subst-var-by "ccPath" "${stdenv.gcc}/bin/cc"
|
||||||
|
|
Loading…
Reference in a new issue