1 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ee652e79e1..528eef97ff 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -355,9 +355,7 @@ EXTRA_IMAGEDEPENDS = ""
 # Toolchain info.
 ##################################################################
-CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
+PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
-CROSS_DATADIR = "${CROSS_DIR}/share"
-PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
 export PATH
 ##################################################################

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index ee652e79e1..528eef97ff 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf
@@ -355,9 +355,7 @@ EXTRA_IMAGEDEPENDS = ""
355	# Toolchain info.	355	# Toolchain info.
356	##################################################################	356	##################################################################
357		357
358	CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"	358	PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
359	CROSS_DATADIR = "${CROSS_DIR}/share"
360	PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
361	export PATH	359	export PATH
362		360
363	##################################################################	361	##################################################################