diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-06-21 09:19:48 -0700 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-06-21 09:19:48 -0700 |
| commit | 820052eb2c6eda39111e16f7f374a0da85cdb9bc (patch) | |
| tree | ffad221ad76b0e384ce40a026c804a102aee5bf2 | |
| parent | 116807aa5527138a2f277385d4d2033a3ed732cd (diff) | |
| parent | 195800e8816a53d5faafde4a0990a904dbac2510 (diff) | |
| download | nixlib-820052eb2c6eda39111e16f7f374a0da85cdb9bc.tar nixlib-820052eb2c6eda39111e16f7f374a0da85cdb9bc.tar.gz nixlib-820052eb2c6eda39111e16f7f374a0da85cdb9bc.tar.bz2 nixlib-820052eb2c6eda39111e16f7f374a0da85cdb9bc.tar.lz nixlib-820052eb2c6eda39111e16f7f374a0da85cdb9bc.tar.xz nixlib-820052eb2c6eda39111e16f7f374a0da85cdb9bc.tar.zst nixlib-820052eb2c6eda39111e16f7f374a0da85cdb9bc.zip | |
Merge pull request #2983 from jwiegley/zlib
Do not use static-libgcc flag on Darwin
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 088eb1b94930..f45c18dd0f14 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = "-static-libgcc"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc"; crossAttrs = { dontStrip = static; |