[oe-commits] Christopher Larson : tcmode-external-csl: avoid hardcoding a list of ia32 archs

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 166a3f79d2538f40fb150c90b0f8e28987db8daa
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=166a3f79d2538f40fb150c90b0f8e28987db8daa

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Mon May 14 11:45:03 2012 -0500

tcmode-external-csl: avoid hardcoding a list of ia32 archs

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/distro/include/tcmode-external-csl.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-csl.inc
index 0a48658..deabd49 100644
--- a/meta/conf/distro/include/tcmode-external-csl.inc
+++ b/meta/conf/distro/include/tcmode-external-csl.inc
@@ -70,7 +70,9 @@ python toolchain_metadata_setup () {
 
     d = e.data
 
-    if d.getVar('TUNE_PKGARCH', True) in ('i586', 'i686'):
+    l = d.createCopy()
+    l.finalize()
+    if os.path.exists(bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/gcc', l)):
         d.setVar('TOOLCHAIN_PATH_ADD', '')
 }
 addhandler toolchain_metadata_setup
@@ -81,7 +83,7 @@ python toolchain_setup () {
 
     d = e.data
 
-    if d.getVar('TUNE_PKGARCH', True) in ('i586', 'i686'):
+    if not d.getVar('TOOLCHAIN_PATH_ADD', True):
         populate_toolchain_links(d)
 }
 addhandler toolchain_setup