diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-13 11:31:24 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 23:30:37 -0400 |
commit | 330ca731e88ec015181c43d92ae8f7c77cf0226a (patch) | |
tree | 1e840031c407cd50702ff78d05daca2f28c45c46 /pkgs/development/libraries/glibc | |
parent | d7160f39bd46e8ee86e95cbaf7a8f3d5685ab30c (diff) | |
download | nixpkgs-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar nixpkgs-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.gz nixpkgs-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.bz2 nixpkgs-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.lz nixpkgs-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.xz nixpkgs-330ca731e88ec015181c43d92ae8f7c77cf0226a.tar.zst nixpkgs-330ca731e88ec015181c43d92ae8f7c77cf0226a.zip |
treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of dependencies is replaced with a dedicated `strictDeps` for that purpose. (Experience has shown that my punning was a terrible idea that made more difficult and embarrising to teach teach.) Now that is is clear, a few packages now use `strictDeps`, to fix various bugs: - bintools-wrapper and cc-wrapper
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r-- | pkgs/development/libraries/glibc/2.27.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/development/libraries/glibc/2.27.nix b/pkgs/development/libraries/glibc/2.27.nix index bb057ae899e..bf63b97635a 100644 --- a/pkgs/development/libraries/glibc/2.27.nix +++ b/pkgs/development/libraries/glibc/2.27.nix @@ -71,14 +71,15 @@ callPackage ./common-2.27.nix { inherit stdenv; } { # Get rid of more unnecessary stuff. rm -rf $out/var $bin/bin/sln - + '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. - if [ -z "$crossConfig" ]; then - for i in "$out"/lib/*.a; do - [ "$i" = "$out/lib/libm.a" ] || strip -S "$i" - done - fi + + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + + for i in "$out"/lib/*.a; do + [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i" + done + '' + '' # Put libraries for static linking in a separate output. Note # that libc_nonshared.a and libpthread_nonshared.a are required diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 976dbcde47f..ea443ce9a24 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -71,14 +71,15 @@ callPackage ./common.nix { inherit stdenv; } { # Get rid of more unnecessary stuff. rm -rf $out/var $bin/bin/sln - + '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. - if [ -z "$crossConfig" ]; then - for i in "$out"/lib/*.a; do - [ "$i" = "$out/lib/libm.a" ] || strip -S "$i" - done - fi + + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + + for i in "$out"/lib/*.a; do + [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i" + done + '' + '' # Put libraries for static linking in a separate output. Note # that libc_nonshared.a and libpthread_nonshared.a are required |