diff options
| author | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2019-01-11 13:20:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 13:20:46 +0000 |
| commit | 9a21967f0a629ac72300111d9734dacf34ab7165 (patch) | |
| tree | 20d770c18888bbcf2d1180f262a9dba77dffa5de /pkgs/build-support | |
| parent | 403079a10877237c98a248c8a985fa5b0bd84d5c (diff) | |
| parent | d121dd5222274234a420d1c31732b9049a734d73 (diff) | |
| download | nixpkgs-9a21967f0a629ac72300111d9734dacf34ab7165.tar nixpkgs-9a21967f0a629ac72300111d9734dacf34ab7165.tar.gz nixpkgs-9a21967f0a629ac72300111d9734dacf34ab7165.tar.bz2 nixpkgs-9a21967f0a629ac72300111d9734dacf34ab7165.tar.lz nixpkgs-9a21967f0a629ac72300111d9734dacf34ab7165.tar.xz nixpkgs-9a21967f0a629ac72300111d9734dacf34ab7165.tar.zst nixpkgs-9a21967f0a629ac72300111d9734dacf34ab7165.zip | |
stdenv: prune libtool files by default (#51767)
See the motivation in fd97db43bcb05e37f6bb77f363f1e1e239d9de53 (#41819).
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/setup-hooks/prune-libtool-files.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/setup-hooks/prune-libtool-files.sh b/pkgs/build-support/setup-hooks/prune-libtool-files.sh index d75812e05b6..5d7432e8f09 100644 --- a/pkgs/build-support/setup-hooks/prune-libtool-files.sh +++ b/pkgs/build-support/setup-hooks/prune-libtool-files.sh @@ -8,7 +8,7 @@ fixupOutputHooks+=(_pruneLibtoolFiles) _pruneLibtoolFiles() { - if [ "$dontPruneLibtoolFiles" ]; then + if [ "$dontPruneLibtoolFiles" ] || [ ! -e "$prefix" ]; then return fi @@ -16,7 +16,7 @@ _pruneLibtoolFiles() { # the "old_library" field for static libraries. We are processing only # those .la files that do not describe static libraries. find "$prefix" -type f -name '*.la' \ - -exec grep -q '^# Generated by libtool' {} \; \ + -exec grep -q '^# Generated by .*libtool' {} \; \ -exec grep -q "^old_library=''" {} \; \ -exec sed -i {} -e "/^dependency_libs='[^']/ c dependency_libs='' #pruned" \; } |