diff options
| author | John Ericson <git@JohnEricson.me> | 2019-04-16 23:55:31 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 21:48:58 -0400 |
| commit | 1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a (patch) | |
| tree | 4ca4737bff457205acabd3ec7d3d1084a64d8a1d /pkgs/stdenv | |
| parent | 4048acb5cf533d35f25221af200fc40d07f25a63 (diff) | |
| download | nixpkgs-1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a.tar nixpkgs-1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a.tar.gz nixpkgs-1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a.tar.bz2 nixpkgs-1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a.tar.lz nixpkgs-1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a.tar.xz nixpkgs-1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a.tar.zst nixpkgs-1a7a96a093c8c3ee25ab18e36473394e1e2a5b0a.zip | |
stdenv, compiler-rt: Compress WASI conditionals
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index ed022422c26..1ef2ab52029 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -88,10 +88,7 @@ let # there (yet?) so it goes here until then. preHook = preHook+ lib.optionalString buildPlatform.isDarwin '' export NIX_BUILD_DONT_SET_RPATH=1 - '' + lib.optionalString hostPlatform.isDarwin '' - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - '' + lib.optionalString (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho) '' + '' + lib.optionalString (hostPlatform.isDarwin || (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho)) '' export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 '' |