summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-07-21 10:42:38 -0700
committerKhem Raj <raj.khem@gmail.com>2010-07-22 10:09:29 -0700
commit526394a2f3cd44f09612687cad46a19e9af88402 (patch)
tree1e83630fe93d1f272897948e249c4b1c5edb2ad7 /conf
parentaceff7eb3609c93f28daf4a7dd9851dec5e44268 (diff)
classes,bitbake.conf: Remove CROSS_DIR, install cross-packages into native sysroot
* Update references to CROSS_DIR in classes and bitbake.conf. * This patch is based on Joshua Lock's work in poky. Signed-off-by: Khem Raj <raj.khem@gmail.com> Acked-by: Tom Rini <tom_rini@mentor.com> Acked-by: Richard Purdie <rpurdie@rpsys.net> Ackef-by: Chris Larson <clarson@kergoth.com> Acked-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf7
1 files changed, 2 insertions, 5 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 69d00e2194..748abba0e3 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -410,10 +410,7 @@ EXTRA_IMAGEDEPENDS = ""
##################################################################
# Toolchain info.
##################################################################
-
-CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
-CROSS_DATADIR = "${CROSS_DIR}/share"
-PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_SBINDIR_NATIVE}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}${base_bindir_native}:"
+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}:"
export PATH
##################################################################
@@ -422,7 +419,7 @@ export PATH
CCACHE ?= ""
TOOLCHAIN_OPTIONS = ""
-TOOLCHAIN_PATH ?= "${CROSS_DIR}"
+TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}"
TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}"
export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"