pyrox.dev
misc setup-hooks: Use env vars to refer to binutils programs
This is more robust for cross-compilation
+3
-3
pkgs/build-support/setup-hooks/separate-debug-info.sh
+3
-3
pkgs/build-support/setup-hooks/separate-debug-info.sh
···
19
19
if ! isELF "$i"; then continue; fi
20
20
21
21
# Extract the Build ID. FIXME: there's probably a cleaner way.
22
-
local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
22
+
local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
23
23
if [ "${#id}" != 40 ]; then
24
24
echo "could not find build ID of $i, skipping" >&2
25
25
continue
···
28
28
# Extract the debug info.
29
29
header "separating debug info from $i (build ID $id)"
30
30
mkdir -p "$dst/${id:0:2}"
31
-
objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug"
32
-
strip --strip-debug "$i"
31
+
$OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug"
32
+
$STRIP --strip-debug "$i"
33
33
34
34
# Also a create a symlink <original-name>.debug.
35
35
ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")"
+1
-1
pkgs/build-support/setup-hooks/strip.sh
+1
-1
pkgs/build-support/setup-hooks/strip.sh
···
30
30
31
31
if [ -n "${dirs}" ]; then
32
32
header "stripping (with flags $stripFlags) in$dirs"
33
-
find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags 2>/dev/null || true
33
+
find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $STRIP $commonStripFlags $stripFlags 2>/dev/null || true
34
34
stopNest
35
35
fi
36
36
}
+1
-1
pkgs/build-support/setup-hooks/win-dll-link.sh
+1
-1
pkgs/build-support/setup-hooks/win-dll-link.sh
···
25
25
linkCount=0
26
26
# Iterate over any DLL that we depend on.
27
27
local dll
28
-
for dll in $(objdump -p *.{exe,dll} | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do
28
+
for dll in $($OBJDUMP -p *.{exe,dll} | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do
29
29
if [ -e "./$dll" ]; then continue; fi
30
30
# Locate the DLL - it should be an *executable* file on $DLLPATH.
31
31
local dllPath="$(PATH="$DLLPATH" type -P "$dll")"