diff options
-rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index 69ea063c8c..c7170349db 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh | |||
@@ -8,8 +8,8 @@ done | |||
8 | # fix dynamic loader paths in all ELF SDK binaries | 8 | # fix dynamic loader paths in all ELF SDK binaries |
9 | # allow symlinks to be accessed via the find command too | 9 | # allow symlinks to be accessed via the find command too |
10 | native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') | 10 | native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') |
11 | dl_path=$($SUDO_EXEC find $native_sysroot/lib/ -maxdepth 1 -name "ld-linux*") | 11 | dl_paths=$($SUDO_EXEC find $native_sysroot/lib*/ -maxdepth 1 -name "ld-linux*") |
12 | if [ "$dl_path" = "" ] ; then | 12 | if [ "$dl_paths" = "" ] ; then |
13 | echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" | 13 | echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" |
14 | exit 1 | 14 | exit 1 |
15 | fi | 15 | fi |
@@ -39,7 +39,9 @@ if [ x\${PYTHON} = "x" ]; then | |||
39 | echo "SDK could not be relocated. No python found." | 39 | echo "SDK could not be relocated. No python found." |
40 | exit 1 | 40 | exit 1 |
41 | fi | 41 | fi |
42 | \${PYTHON} ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files | 42 | for dl_path in \$(echo "$dl_paths"); do |
43 | \${PYTHON} ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir \$dl_path $executable_files | ||
44 | done | ||
43 | EOF | 45 | EOF |
44 | 46 | ||
45 | $SUDO_EXEC mv $tdir/relocate_sdk.sh ${env_setup_script%/*}/relocate_sdk.sh | 47 | $SUDO_EXEC mv $tdir/relocate_sdk.sh ${env_setup_script%/*}/relocate_sdk.sh |