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 | |
| 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>
| -rw-r--r-- | classes/cmake.bbclass | 2 | ||||
| -rw-r--r-- | classes/cross.bbclass | 4 | ||||
| -rw-r--r-- | classes/icecc.bbclass | 6 | ||||
| -rw-r--r-- | conf/bitbake.conf | 5 |
4 files changed, 8 insertions, 9 deletions
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass index 2376012e80..4d53e47a1a 100644 --- a/classes/cmake.bbclass +++ b/classes/cmake.bbclass @@ -37,7 +37,7 @@ cmake_do_generate_toolchain_file() { # only search in the paths provided (from openembedded) so cmake doesnt pick # up libraries and tools from the native build machine - echo "set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${STAGING_DIR_NATIVE}${prefix_native} )" >> ${WORKDIR}/toolchain.cmake + echo "set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH} )" >> ${WORKDIR}/toolchain.cmake echo "set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )" >> ${WORKDIR}/toolchain.cmake echo "set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )" >> ${WORKDIR}/toolchain.cmake echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )" >> ${WORKDIR}/toolchain.cmake diff --git a/classes/cross.bbclass b/classes/cross.bbclass index db86192e05..99f4ede52c 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -44,9 +44,9 @@ target_base_libdir := "${base_libdir}" target_prefix := "${prefix}" # Overrides for paths -prefix = "${STAGING_DIR_NATIVE}${prefix_native}" base_prefix = "${STAGING_DIR_NATIVE}" -exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +prefix = "${base_prefix}${prefix_native}/${BASE_PACKAGE_ARCH}" +exec_prefix = "${prefix}" base_sbindir = "${base_prefix}/bin" sbindir = "${exec_prefix}/bin" diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 938f199308..cd5a25bf28 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -46,7 +46,7 @@ def create_cross_env(bb,d): return "" import tarfile, socket, time - ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}', d) + ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}', d) staging_dir = bb.data.expand('${STAGING_DIR_TARGET}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) @@ -96,7 +96,7 @@ def create_cross_env(bb,d): def create_native_env(bb,d): import tarfile, socket, time - ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}', d) + ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) @@ -143,7 +143,7 @@ def get_cross_kernel_cc(bb,d): def create_cross_kernel_env(bb,d): import tarfile, socket, time - ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}', d) + ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) 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}" |