diff --git a/elbepack/makofiles/toolchain-shar-extract.sh.mako b/elbepack/makofiles/toolchain-shar-extract.sh.mako index 6c4d54c04..f89c32783 100644 --- a/elbepack/makofiles/toolchain-shar-extract.sh.mako +++ b/elbepack/makofiles/toolchain-shar-extract.sh.mako @@ -354,14 +354,6 @@ for link in $abs_symbolic_links; do ln -s \$target \$link done -for exe in $native_executable_files; do - if [ \`readlink -f \$exe\` == \`readlink -f $dl_path\` ]; then - echo SKIP \$exe - else - \$PATCHELF --set-interpreter $dl_path \$exe - fi -done - for exe in $native_elf_files; do if [ \`readlink -f \$exe\` == \`readlink -f $dl_path\` ]; then echo SKIP \$exe @@ -387,6 +379,14 @@ for exe in $target_elf_files; do fi done +for exe in $native_executable_files; do + if [ \`readlink -f \$exe\` == \`readlink -f $dl_path\` ]; then + echo SKIP \$exe + else + \$PATCHELF --set-interpreter $dl_path \$exe + fi +done + for exe in $ascii_so_files; do sed -i -e "s%\([ (]\)/\(usr\|lib\|lib64\)/%\1$native_sysroot/\2/%g" \$exe done