summary refs log tree commit diff
path: root/pkgs/development/libraries/libressl
diff options
context:
space:
mode:
authorRuud van Asseldonk <dev@veniogames.com>2019-08-13 22:20:16 +0200
committerRuud van Asseldonk <dev@veniogames.com>2019-08-13 22:20:16 +0200
commitc02b4a1cc8c718d4e6a1ef5fbb547388bb4636df (patch)
tree02c7cfa9d01a7e0e6b1d2e3ecd704effd606266a /pkgs/development/libraries/libressl
parentb3c613b9aaa32a6315f5a10fcf56f5b58e0cd405 (diff)
downloadnixpkgs-c02b4a1cc8c718d4e6a1ef5fbb547388bb4636df.tar
nixpkgs-c02b4a1cc8c718d4e6a1ef5fbb547388bb4636df.tar.gz
nixpkgs-c02b4a1cc8c718d4e6a1ef5fbb547388bb4636df.tar.bz2
nixpkgs-c02b4a1cc8c718d4e6a1ef5fbb547388bb4636df.tar.lz
nixpkgs-c02b4a1cc8c718d4e6a1ef5fbb547388bb4636df.tar.xz
nixpkgs-c02b4a1cc8c718d4e6a1ef5fbb547388bb4636df.tar.zst
nixpkgs-c02b4a1cc8c718d4e6a1ef5fbb547388bb4636df.zip
libressl: do not set noexecstack on Darwin at all
It is not needed on Darwin. [1] Thanks Matthew for explaining this.

[1]: https://github.com/NixOS/nixpkgs/pull/66454#issuecomment-520970986
Diffstat (limited to 'pkgs/development/libraries/libressl')
-rw-r--r--pkgs/development/libraries/libressl/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 32b58c736fb..f30ead30b3b 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -25,9 +25,11 @@ let
 
     # Ensure that the output libraries do not require an executable stack.
     # Without this, libcrypto would be built with the executable stack flag set.
-    # For Clang, the flag is '--noexecstack', for GCC it is '-z noexecstack'.
+    # For GCC the flag is '-z noexecstack'. Clang, which is used on Darwin,
+    # expects '--noexecstack'. Execstack is an ELF thing, so it is not needed
+    # on Darwin.
     NIX_LDFLAGS = if stdenv.isDarwin
-      then ["--noexecstack"]
+      then []
       else ["-z" "noexecstack"];
 
     enableParallelBuilding = true;