diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:11:21 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:11:21 +0200 |
| commit | 91c13172721c979710f33906a7a56c0a67cb8214 (patch) | |
| tree | 276067de68188a5fe16e05c269fc4648ad7b28f6 | |
| parent | 6b27ceb006ace21f9157034ac743242a0147eeec (diff) | |
| download | nixpkgs-91c13172721c979710f33906a7a56c0a67cb8214.tar nixpkgs-91c13172721c979710f33906a7a56c0a67cb8214.tar.gz nixpkgs-91c13172721c979710f33906a7a56c0a67cb8214.tar.bz2 nixpkgs-91c13172721c979710f33906a7a56c0a67cb8214.tar.lz nixpkgs-91c13172721c979710f33906a7a56c0a67cb8214.tar.xz nixpkgs-91c13172721c979710f33906a7a56c0a67cb8214.tar.zst nixpkgs-91c13172721c979710f33906a7a56c0a67cb8214.zip | |
glibc: fixup retaining bootstrap-tools reference
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 0ea6b4b938b..2a1652a5501 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -72,6 +72,14 @@ in # Get rid of more unnecessary stuff. rm -rf $out/var $out/sbin/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 + strip -S "$i" + done + fi + # Put libraries for static linking in a separate output. Note # that libc_nonshared.a and libpthread_nonshared.a are required # for dynamically-linked applications. |