summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/icecc.bbclass17
1 files changed, 8 insertions, 9 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index e8725b582b..35a1aaef86 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -210,15 +210,14 @@ def icecc_get_tool(bb, d, tool):
210 else: 210 else:
211 ice_dir = d.expand('${STAGING_BINDIR_TOOLCHAIN}') 211 ice_dir = d.expand('${STAGING_BINDIR_TOOLCHAIN}')
212 target_sys = d.expand('${TARGET_SYS}') 212 target_sys = d.expand('${TARGET_SYS}')
213 tool_bin = os.path.join(ice_dir, "%s-%s" % (target_sys, tool)) 213 for p in ice_dir.split(':'):
214 if os.path.isfile(tool_bin): 214 tool_bin = os.path.join(p, "%s-%s" % (target_sys, tool))
215 return tool_bin 215 if os.path.isfile(tool_bin):
216 else: 216 return tool_bin
217 external_tool_bin = icecc_get_external_tool(bb, d, tool) 217 external_tool_bin = icecc_get_external_tool(bb, d, tool)
218 if os.path.isfile(external_tool_bin): 218 if os.path.isfile(external_tool_bin):
219 return external_tool_bin 219 return external_tool_bin
220 else: 220 return ""
221 return ""
222 221
223def icecc_get_and_check_tool(bb, d, tool): 222def icecc_get_and_check_tool(bb, d, tool):
224 # Check that g++ or gcc is not a symbolic link to icecc binary in 223 # Check that g++ or gcc is not a symbolic link to icecc binary in