1 files changed, 1 insertions, 1 deletions

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index ee411ddca0..71da5e5409 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -62,7 +62,7 @@ toolchain_create_tree_env_script () {
         script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
         rm -f $script
         touch $script
-        echo ". ${COREBASE}/oe-init-build-env ${TOPDIR}" >> $script
+        echo 'orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env ${TOPDIR}; cd $orig' >> $script
         echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> $script
         echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script
         echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script