From db995d3bf1b51fa480be39bcdf8234acf4bb993f Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 15 Aug 2012 09:11:36 -0700 Subject: [PATCH] tcmode: due to the switch to a SYSROOT var, shift when populate_toolchain_links happens Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index 59c51fa..341994a 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -87,6 +87,7 @@ python toolchain_metadata_setup () { if os.path.exists(bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/gcc', l)): d.setVar('TOOLCHAIN_PATH_ADD', '') + populate_toolchain_links(l) # The external toolchain may not have been built with the yocto preferred # gnu hash setting, so ensure that the corresponding sanity check is a @@ -99,25 +100,11 @@ python toolchain_metadata_setup () { } addhandler toolchain_metadata_setup -python toolchain_setup () { - if not isinstance(e, bb.event.BuildStarted): - return - - d = e.data - - if not d.getVar('TOOLCHAIN_PATH_ADD', True): - populate_toolchain_links(d) -} -addhandler toolchain_setup - def populate_toolchain_links(d): import errno import os from glob import glob - d = d.createCopy() - d.finalize() - pattern = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*') files = glob(pattern) if not files: