aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-01-18 15:01:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-19 17:10:58 +0000
commit418a353a011ca8f04ecc3e2d29f2d1a415492081 (patch)
treed549074e3301d9f07b9b04eac27af43bb690dd61
parent6092da20fc3ceb1bc6b4872ad16df565f05723b7 (diff)
downloadopenembedded-core-contrib-418a353a011ca8f04ecc3e2d29f2d1a415492081.tar.gz
openembedded-core-contrib-418a353a011ca8f04ecc3e2d29f2d1a415492081.tar.bz2
openembedded-core-contrib-418a353a011ca8f04ecc3e2d29f2d1a415492081.zip
icecc: Fix allarch and native recipes having different signatures
* for different MACHINES * is there more elegant way to have "overridable" function so that signature handler properly uses only the branch without STAGING_BINDIR_TOOLCHAIN? Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/icecc.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 054e25c079..549bd69eda 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -142,6 +142,8 @@ def icc_is_native(bb, d):
bb.data.inherits_class("cross", d) or \
bb.data.inherits_class("native", d);
+# Don't pollute allarch signatures with TARGET_FPU
+icc_version[vardepsexclude] += "TARGET_FPU"
def icc_version(bb, d):
if use_icc(bb, d) == "no":
return ""
@@ -182,6 +184,8 @@ def icc_get_external_tool(bb, d, tool):
target_prefix = d.expand('${TARGET_PREFIX}')
return os.path.join(external_toolchain_bindir, '%s%s' % (target_prefix, tool))
+# Don't pollute native signatures with target TUNE_PKGARCH through STAGING_BINDIR_TOOLCHAIN
+icc_get_tool[vardepsexclude] += "STAGING_BINDIR_TOOLCHAIN"
def icc_get_tool(bb, d, tool):
if icc_is_native(bb, d):
return bb.utils.which(os.getenv("PATH"), tool)