From c2fa59f46bbc86985e6c8e4d5d514a07a9ade884 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 29 Sep 2015 13:43:45 +0100 Subject: toolchain-shar-extract: Correct environment-setup script names for multilib Currently a lib32-core-image-* SDK prints an incorrect environment-setup-* file name when installing the SDK. Instead of printing the wrong thing, list the environment setup files present in the SDK. As it happens this fixes the message printed with buildtools-tarball too which someone reported to me about the same time as I finished this patch! Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index dd92d0eb7f..2ffc2d1c07 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -182,7 +182,9 @@ fi echo "SDK has been successfully set up and is ready to be used." echo "Each time you wish to use the SDK in a new shell session, you need to source the environment setup script e.g." -echo " \$ . $target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@" +for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do + echo " \$ . $target_sdk_dir/$env_setup_script" +done exit 0 -- cgit 1.2.3-korg