Call $LDSO --verify for the binary file -inside- the chroot. This fixes building x86 boot images on a x86_64 host system.

Also don't try to verify the binary if $LDSO is empty.

1 files changed, 8 insertions, 6 deletions

diff --git a/scripts/buildinstall.functions b/scripts/buildinstall.functions
index 54c7f2785..35e51a766 100755
--- a/scripts/buildinstall.functions
+++ b/scripts/buildinstall.functions
@@ -15,16 +15,18 @@ get_dso_deps() {
 
     # this is a hack, but the only better way requires binutils or elfutils
     # be installed.  i.e., we need readelf to find the interpretter.
-    $LDSO --verify $bin >/dev/null 2>&1
-    case $? in
-      [02]) ;;
-        *) unset LDSO ;;
-    esac
+    if [ -n "$LDSO" ]; then
+        $LDSO --verify $root/$bin >/dev/null 2>&1
+        case $? in
+          [02]) ;;
+            *) unset LDSO ;;
+        esac
+    fi
     if [ -z "$LDSO" ]; then
         for ldso in $root/$LDSODIR/ld*.so* ; do
             [ -L $ldso ] && continue
             [ -x $ldso ] || continue
-            $ldso --verify $bin >/dev/null 2>&1
+            $ldso --verify $root/$bin >/dev/null 2>&1
             case $? in
                 [02]) LDSO=$(echo $ldso |sed -e "s,$root,,") ; break ;;
             esac