diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
| commit | 16be434b0bec4d14a893010b46f56a64cab74cc1 (patch) | |
| tree | 25e77807d55c76d42817197d576349478ff500a5 /pkgs/development/tools/misc | |
| parent | d76bc8ed15cfa21d9f1cc47a06ee1fe8ac86d6d3 (diff) | |
| parent | b0ada07f36abc21c990000b5cdbe780157d6b92b (diff) | |
| download | nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.gz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.bz2 nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.lz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.xz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.zst nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.zip | |
Merge accepted cross compilation PRs into staging
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/libtool/libtool2.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index a81255212da5..f25fbcd00d84 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, m4, perl, help2man }: +{ stdenv, fetchurl, m4, perl, help2man +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "libtool-2.4.6"; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. - dontStrip = stdenv ? cross; + dontStrip = hostPlatform != buildPlatform; meta = { description = "GNU Libtool, a generic library support script"; |