summaryrefslogtreecommitdiffstats
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-21 10:20:12 +0000
commit033671d82ad04235b104a7f6fb95a18447f771eb (patch)
tree618cd30a49bea9fad5eb8d880d703a2e195ffe7c
parentcb714e13422229ab8a986063699e97bf13e55aa1 (diff)
downloadpoky-033671d82ad04235b104a7f6fb95a18447f771eb.tar.gz
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? (From OE-Core rev: 418a353a011ca8f04ecc3e2d29f2d1a415492081) 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):
142 bb.data.inherits_class("cross", d) or \ 142 bb.data.inherits_class("cross", d) or \
143 bb.data.inherits_class("native", d); 143 bb.data.inherits_class("native", d);
144 144
145# Don't pollute allarch signatures with TARGET_FPU
146icc_version[vardepsexclude] += "TARGET_FPU"
145def icc_version(bb, d): 147def icc_version(bb, d):
146 if use_icc(bb, d) == "no": 148 if use_icc(bb, d) == "no":
147 return "" 149 return ""
@@ -182,6 +184,8 @@ def icc_get_external_tool(bb, d, tool):
182 target_prefix = d.expand('${TARGET_PREFIX}') 184 target_prefix = d.expand('${TARGET_PREFIX}')
183 return os.path.join(external_toolchain_bindir, '%s%s' % (target_prefix, tool)) 185 return os.path.join(external_toolchain_bindir, '%s%s' % (target_prefix, tool))
184 186
187# Don't pollute native signatures with target TUNE_PKGARCH through STAGING_BINDIR_TOOLCHAIN
188icc_get_tool[vardepsexclude] += "STAGING_BINDIR_TOOLCHAIN"
185def icc_get_tool(bb, d, tool): 189def icc_get_tool(bb, d, tool):
186 if icc_is_native(bb, d): 190 if icc_is_native(bb, d):
187 return bb.utils.which(os.getenv("PATH"), tool) 191 return bb.utils.which(os.getenv("PATH"), tool)