Merge master into closure-size
The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
This commit is contained in:
@@ -11,14 +11,9 @@ _separateDebugInfo() {
|
||||
dst="$dst/lib/debug/.build-id"
|
||||
|
||||
# Find executables and dynamic libraries.
|
||||
local -a files=($(find "$prefix" -type f -a \( -perm /0100 -o -name "*.so" -o -name "*.so.*" \)))
|
||||
|
||||
local i magic
|
||||
for i in "${files[@]}"; do
|
||||
# Skip non-ELF files.
|
||||
exec 10< "$i"
|
||||
read -n 4 -u 10 magic
|
||||
exec 10<&-
|
||||
while IFS= read -r -d $'\0' i; do
|
||||
if ! isELF "$i"; then continue; fi
|
||||
|
||||
# Extract the Build ID. FIXME: there's probably a cleaner way.
|
||||
local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
|
||||
@@ -35,7 +30,7 @@ _separateDebugInfo() {
|
||||
|
||||
# Also a create a symlink <original-name>.debug.
|
||||
ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")"
|
||||
done
|
||||
done < <(find "$prefix" -type f -print0)
|
||||
}
|
||||
|
||||
# - We might prefer to compress the debug info during link-time already,
|
||||
|
||||
Reference in New Issue
Block a user