diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-27 01:23:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-30 16:33:26 +0100 |
commit | a2c5509520d5c3e082f55844e6545d0309565f8f (patch) | |
tree | a3814135e0658d4c48ab5318bca919a9123e4227 /meta/recipes-core | |
parent | 7d6050c57f195589c8429397432c78f68298b672 (diff) | |
download | openembedded-core-a2c5509520d5c3e082f55844e6545d0309565f8f.tar.gz openembedded-core-a2c5509520d5c3e082f55844e6545d0309565f8f.tar.bz2 openembedded-core-a2c5509520d5c3e082f55844e6545d0309565f8f.zip |
binutils/gcc/gdb: Add TARGET_ARCH to PN for all cross recipes
This allows them to co-exist together in the native sysroot, with one
set of cross tools per target architecture.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-initial.inc | 6 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-ide-support.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-initial_git.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/uclibc/uclibc_git.bb | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc index 4cc6ffea99..92402f8ff5 100644 --- a/meta/recipes-core/eglibc/eglibc-initial.inc +++ b/meta/recipes-core/eglibc/eglibc-initial.inc @@ -4,9 +4,9 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" PACKAGES_DYNAMIC = "" -STAGINGCC = "gcc-cross-initial" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" do_configure () { sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 5008cf2931..30654f6d88 100644 --- a/meta/recipes-core/eglibc/eglibc.inc +++ b/meta/recipes-core/eglibc/eglibc.inc @@ -2,8 +2,8 @@ require eglibc-common.inc require eglibc-ld.inc require eglibc-testing.inc -STAGINGCC = "gcc-cross-initial" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index 40bda28949..03cad6ed69 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS = "virtual/libc gdb-cross qemu-native qemu-helper-native unfs3-native" +DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native" PR = "r3" inherit meta toolchain-scripts diff --git a/meta/recipes-core/uclibc/uclibc-initial_git.bb b/meta/recipes-core/uclibc/uclibc-initial_git.bb index 6433229174..c937ccb108 100644 --- a/meta/recipes-core/uclibc/uclibc-initial_git.bb +++ b/meta/recipes-core/uclibc/uclibc-initial_git.bb @@ -8,8 +8,8 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" PACKAGES_DYNAMIC = "" -STAGINGCC = "gcc-cross-initial" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" do_install() { # Install initial headers into the cross dir diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb index 38a7e45517..fd02b3d612 100644 --- a/meta/recipes-core/uclibc/uclibc_git.bb +++ b/meta/recipes-core/uclibc/uclibc_git.bb @@ -2,8 +2,8 @@ require uclibc.inc require uclibc-package.inc require uclibc-git.inc -STAGINGCC = "gcc-cross-initial" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" |