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

Merge remote-tracking branch 'upstream/staging' into master

This commit is contained in:
Tuomas Tynkkynen 2016-06-06 22:17:38 +03:00
parent c85f2b20e6 e9d3acbaf1
commit 345d0a3ea6
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/3.6/llvm.nix
View File

@ -57,10 +57,6 @@ in stdenv.mkDerivation rec {
rm -fR $out rm -fR $out
paxmark m bin/{lli,llvm-rtdyld} paxmark m bin/{lli,llvm-rtdyld}
paxmark m unittests/ExecutionEngine/JIT/JITTests
paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
paxmark m unittests/Support/SupportTests
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/compilers/llvm/3.7/llvm.nix
View File

@ -62,10 +62,6 @@ in stdenv.mkDerivation rec {
rm -fR $out rm -fR $out
paxmark m bin/{lli,llvm-rtdyld} paxmark m bin/{lli,llvm-rtdyld}
paxmark m unittests/ExecutionEngine/JIT/JITTests
paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
paxmark m unittests/Support/SupportTests
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/compilers/llvm/3.8/llvm.nix
View File

@ -67,10 +67,6 @@ in stdenv.mkDerivation rec {
rm -fR $out rm -fR $out
paxmark m bin/{lli,llvm-rtdyld} paxmark m bin/{lli,llvm-rtdyld}
paxmark m unittests/ExecutionEngine/JIT/JITTests
paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
paxmark m unittests/Support/SupportTests
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

10
pkgs/stdenv/generic/setup.sh
View File

@ -236,6 +236,11 @@ BASH="$SHELL"
export CONFIG_SHELL="$SHELL" export CONFIG_SHELL="$SHELL"
# Dummy implementation of the paxmark function. On Linux, this is
# overwritten by paxctl's setup hook.
paxmark() { true; }
# Execute the pre-hook. # Execute the pre-hook.
if [ -z "$shell" ]; then export shell=$SHELL; fi if [ -z "$shell" ]; then export shell=$SHELL; fi
runHook preHook runHook preHook
@ -369,11 +374,6 @@ fi
export NIX_BUILD_CORES export NIX_BUILD_CORES
# Dummy implementation of the paxmark function. On Linux, this is
# overwritten by paxctl's setup hook.
paxmark() { true; }
# Prevent OpenSSL-based applications from using certificates in # Prevent OpenSSL-based applications from using certificates in
# /etc/ssl. # /etc/ssl.
if [ -z "$SSL_CERT_FILE" ]; then if [ -z "$SSL_CERT_FILE" ]; then