diff options
Diffstat (limited to 'meta/files/toolchain-shar-extract.sh')
| -rw-r--r-- | meta/files/toolchain-shar-extract.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 8ef2b77557..ef47a6ea0c 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -171,9 +171,20 @@ echo "done" printf "Setting it up..." # fix environment paths +real_env_setup_script="" for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do + if grep -q 'OECORE_NATIVE_SYSROOT=' $env_setup_script; then + # Handle custom env setup scripts that are only named + # environment-setup-* so that they have relocation + # applied - what we want beyond here is the main one + # rather than the one that simply sorts last + real_env_setup_script="$env_setup_script" + fi $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script done +if [ -n "$real_env_setup_script" ] ; then + env_setup_script="$real_env_setup_script" +fi @SDK_POST_INSTALL_COMMAND@ |