Patchwork [2/3] tcmode-external-csl: avoid hardcoding a list of ia32 archs

login
register
mail settings
Submitter Christopher Larson
Date May 14, 2012, 4:45 p.m.
Message ID <ee330617f6247dce01dccb23dcded5d2cc5edf87.1337013858.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/27727/
State Accepted
Commit 166a3f79d2538f40fb150c90b0f8e28987db8daa
Headers show

Comments

Christopher Larson - May 14, 2012, 4:45 p.m.
From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/conf/distro/include/tcmode-external-csl.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

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