diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-25 14:20:27 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-25 14:20:27 -0400 |
commit | c701d6cb21e1e83a82ebdefe180f2d6233087f4a (patch) | |
tree | 3e7a7503cd7e84c8d2ee8aaffe264301fb591ebf /pkgs/build-support/setup-hooks | |
parent | 6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf (diff) | |
parent | 6cd28a468aec0005052ee01eaf8510735948a2dd (diff) | |
download | nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.gz nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.bz2 nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.lz nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.xz nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.zst nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/build-support/setup-hooks')
-rw-r--r-- | pkgs/build-support/setup-hooks/auto-patchelf.sh | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 32fdb1000e27..7c165627f72e 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -7,21 +7,7 @@ gatherLibraries() { addEnvHooks "$targetOffset" gatherLibraries isExecutable() { - [ "$(file -b -N --mime-type "$1")" = application/x-executable ] -} - -findElfs() { - find "$1" -type f -exec "$SHELL" -c ' - while [ -n "$1" ]; do - mimeType="$(file -b -N --mime-type "$1")" - if [ "$mimeType" = application/x-executable \ - -o "$mimeType" = application/x-pie-executable \ - -o "$mimeType" = application/x-sharedlib ]; then - echo "$1" - fi - shift - done - ' -- {} + + readelf -h "$1" 2> /dev/null | grep -q '^ *Type: *EXEC\>' } # We cache dependencies so that we don't need to search through all of them on @@ -167,9 +153,14 @@ autoPatchelf() { # findDependency outside of this, the dependency cache needs to be rebuilt # from scratch, so keep this in mind if you want to run findDependency # outside of this function. - findElfs "$prefix" | while read -r elffile; do - autoPatchelfFile "$elffile" - done + while IFS= read -r -d $'\0' file; do + isELF "$file" || continue + if isExecutable "$file"; then + # Skip if the executable is statically linked. + readelf -l "$file" | grep -q "^ *INTERP\\>" || continue + fi + autoPatchelfFile "$file" + done < <(find "$prefix" -type f -print0) } # XXX: This should ultimately use fixupOutputHooks but we currently don't have |