From a2c5509520d5c3e082f55844e6545d0309565f8f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 27 Apr 2014 01:23:07 +0100 Subject: 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 --- meta/recipes-core/eglibc/eglibc-initial.inc | 6 +++--- meta/recipes-core/eglibc/eglibc.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-core/eglibc') 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}" -- cgit v1.2.3