scripts: bundle-libraries: fix logic flaw
Previous refactoring of the script moved the LDSO detection into a
file-not-exists condition, causing onyl the very first executable to
get bundled.
Solve the problem by unconditionally checking for LDSO again.
Fixes: 9030a78a71
("scripts: bundle-libraries: prevent loading host locales")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
parent
acedce1d79
commit
5ebcd32997
1 changed files with 6 additions and 7 deletions
|
@ -156,17 +156,16 @@ for BIN in "$@"; do
|
|||
dest="$DIR/lib/${token##*/}"
|
||||
ddir="${dest%/*}"
|
||||
|
||||
case "$token" in
|
||||
*/ld-*.so*) LDSO="${token##*/}" ;;
|
||||
esac
|
||||
|
||||
[ -f "$token" -a ! -f "$dest" ] && {
|
||||
_md "$ddir"
|
||||
_cp "$token" "$dest"
|
||||
case "$token" in
|
||||
*ld-*.so*)
|
||||
LDSO="${token##*/}"
|
||||
_patch_ldso "$dest"
|
||||
;;
|
||||
libc.so.6|*/libc.so.6)
|
||||
_patch_glibc "$dest"
|
||||
;;
|
||||
*/ld-*.so*) _patch_ldso "$dest" ;;
|
||||
*/libc.so.6) _patch_glibc "$dest" ;;
|
||||
esac
|
||||
}
|
||||
;; esac
|
||||
|
|
Loading…
Reference in a new issue