diff options
author | 2018-02-12 10:51:57 -0600 | |
---|---|---|
committer | 2018-02-15 13:20:04 +0000 | |
commit | 8db0d3c14c166265b740030c208e0e19a0b2a1c6 (patch) | |
tree | b128d6827faa9a445279ec3f0956c7076a1b2abd /meta/classes | |
parent | 20a53ac7818f268d4a4c86c8f35ca982baf96acf (diff) | |
download | openembedded-core-contrib-8db0d3c14c166265b740030c208e0e19a0b2a1c6.tar.gz |
icecc.bbclass: Fix STAGING_BINDIR_TOOLCHAIN usage
STAGING_BINDIR_TOOLCHAIN is actually a path list, not a single path. Fix
icecc.bbclass to try all the paths in the variable instead of treating
it as a single path.
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/icecc.bbclass | 17 |
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): else: ice_dir = d.expand('${STAGING_BINDIR_TOOLCHAIN}') target_sys = d.expand('${TARGET_SYS}') - tool_bin = os.path.join(ice_dir, "%s-%s" % (target_sys, tool)) - if os.path.isfile(tool_bin): - return tool_bin - else: - external_tool_bin = icecc_get_external_tool(bb, d, tool) - if os.path.isfile(external_tool_bin): - return external_tool_bin - else: - return "" + for p in ice_dir.split(':'): + tool_bin = os.path.join(p, "%s-%s" % (target_sys, tool)) + if os.path.isfile(tool_bin): + return tool_bin + external_tool_bin = icecc_get_external_tool(bb, d, tool) + if os.path.isfile(external_tool_bin): + return external_tool_bin + return "" def icecc_get_and_check_tool(bb, d, tool): # Check that g++ or gcc is not a symbolic link to icecc binary in |