about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2017-07-07 12:48:51 -0400
committerGitHub <noreply@github.com>2017-07-07 12:48:51 -0400
commitf5364122b5904fd1b6048cb9d564b9194c0d3845 (patch)
tree2079a9484bda7c61f980956fe4cf82f0fbe5d60f /pkgs/development/compilers
parent21ef8d5c89281a71750cdf51ef7c8d69c52b63ed (diff)
parente57a220f810a9698c5df27a7488839ebea3226e2 (diff)
downloadnixlib-f5364122b5904fd1b6048cb9d564b9194c0d3845.tar
nixlib-f5364122b5904fd1b6048cb9d564b9194c0d3845.tar.gz
nixlib-f5364122b5904fd1b6048cb9d564b9194c0d3845.tar.bz2
nixlib-f5364122b5904fd1b6048cb9d564b9194c0d3845.tar.lz
nixlib-f5364122b5904fd1b6048cb9d564b9194c0d3845.tar.xz
nixlib-f5364122b5904fd1b6048cb9d564b9194c0d3845.tar.zst
nixlib-f5364122b5904fd1b6048cb9d564b9194c0d3845.zip
Merge pull request #27215 from obsidiansystems/stdenv-harden
Harden stdenv in two misc ways
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/swift/patches/build-script-pax.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch
index 9f1976a2d88d..fa2ccdf9d5c6 100644
--- a/pkgs/development/compilers/swift/patches/build-script-pax.patch
+++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch
@@ -1,12 +1,13 @@
 --- swift/utils/build-script-impl	2017-01-23 12:47:20.401326309 -0600
 +++ swift-pax/utils/build-script-impl	2017-01-23 13:24:10.339366996 -0600
-@@ -1823,6 +1823,16 @@ function set_lldb_xcodebuild_options() {
+@@ -1823,6 +1823,17 @@ function set_lldb_xcodebuild_options() {
      fi
  }
  
 +## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh
 +isELF() {
 +    local fn="$1"
++    local fd
 +    local magic
 +    exec {fd}< "$fn"
 +    read -n 4 -u $fd magic