From 4f96a91b1b063a15683b1ae9167ac8a345cc13b2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 30 Jul 2010 00:01:14 -0700 Subject: bitbake.conf,cmake.bbclass,cross.bbclass,icecc.bbclass: Point the toolchain paths to new multi-machine friendly toolchain install location. Signed-off-by: Khem Raj Acked-by: Koen Kooi Acked-by: Martin Jansa --- conf/bitbake.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index d523519080..8ddba150e1 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -299,8 +299,7 @@ STAGING_DIR_JAVA = "${STAGING_DIR}/java" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}" -STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}" -STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}" +STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}${base_bindir_native}" STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" @@ -419,7 +418,7 @@ export PATH CCACHE ?= "" TOOLCHAIN_OPTIONS = "" -TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}" +TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}" TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}" export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" -- cgit v1.2.3