From 9913c95405d45e1ca50538cc7df516079d88d1b3 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 18 Jul 2012 17:19:13 -0700 Subject: [PATCH] external-sourcery: ensure the sysroot is available as a variable again Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 7 +++++++ recipes/meta/external-sourcery-toolchain.bb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index 2a58bc0..1ed41e1 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -63,10 +63,17 @@ python toolchain_metadata_setup () { if not isinstance(e, bb.event.ConfigParsed): return + import subprocess d = e.data l = d.createCopy() l.finalize() + + sysroot_cmd = "${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} -print-sysroot" + toolchain_sysroot = bb.process.run(bb.data.expand(sysroot_cmd, l), + stderr=subprocess.PIPE)[0].rstrip() + d.setVar('EXTERNAL_TOOLCHAIN_SYSROOT', toolchain_sysroot) + if os.path.exists(bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/gcc', l)): d.setVar('TOOLCHAIN_PATH_ADD', '') diff --git a/recipes/meta/external-sourcery-toolchain.bb b/recipes/meta/external-sourcery-toolchain.bb index 608bc3d..3384005 100644 --- a/recipes/meta/external-sourcery-toolchain.bb +++ b/recipes/meta/external-sourcery-toolchain.bb @@ -30,7 +30,7 @@ SRC_URI = "file://SUPPORTED" do_install() { # Use optimized files if available - sysroot="$(${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} -print-sysroot)" + sysroot="${EXTERNAL_TOOLCHAIN_SYSROOT}" cp -a $sysroot${base_libdir}/. ${D}${base_libdir} cp -a $sysroot/etc/. ${D}${sysconfdir}