From bf949722149fc5d3accc9bf690860eee478a879b Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 18 Jul 2012 18:03:15 -0700 Subject: [PATCH] tcmode-external-sourcery: fix PATH for sysroot extraction Also catches failures to run. Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index 1ed41e1..7bd621a 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -70,8 +70,12 @@ python toolchain_metadata_setup () { 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() + try: + toolchain_sysroot = bb.process.run(bb.data.expand(sysroot_cmd, l), + stderr=subprocess.PIPE, + env={"PATH": l.getVar('PATH', True)})[0].rstrip() + except bb.process.CmdError as exc: + bb.warn(str(exc)) d.setVar('EXTERNAL_TOOLCHAIN_SYSROOT', toolchain_sysroot) if os.path.exists(bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/gcc', l)):