diff options
| author | Khem Raj <raj.khem@gmail.com> | 2010-07-30 00:01:14 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-08-03 12:46:05 -0700 |
| commit | 4f96a91b1b063a15683b1ae9167ac8a345cc13b2 (patch) | |
| tree | 5228697b93ef21ba13ee8bcbdf4ef0f4cf0a279f /conf | |
| parent | 69d694e393e409241b91a9c7fac1d01304bd4e87 (diff) | |
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 <raj.khem@gmail.com>
Acked-by: Koen Kooi <k-kooi@ti.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 5 |
1 files changed, 2 insertions, 3 deletions
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}" |