Skip to content
Snippets Groups Projects
Commit 2a76a649 authored by Simon Glass's avatar Simon Glass
Browse files

buildman: Correct toolchain download feature


Commit d9088983 updated the ScanPath() function but not its documentation
and not all its callers.

This breaks the toolchain check after it is downloaded. Fix it.

Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
Acked-by: default avatarHeiko Schocher <hs@denx.de>
parent 7ae8350f
No related branches found
No related tags found
No related merge requests found
...@@ -465,11 +465,15 @@ class Toolchains: ...@@ -465,11 +465,15 @@ class Toolchains:
# Check that the toolchain works # Check that the toolchain works
print 'Testing' print 'Testing'
dirpath = os.path.join(dest, path) dirpath = os.path.join(dest, path)
compiler_fname = self.ScanPath(dirpath, True) compiler_fname_list = self.ScanPath(dirpath, True)
if not compiler_fname: if not compiler_fname_list:
print 'Could not locate C compiler - fetch failed.' print 'Could not locate C compiler - fetch failed.'
return 1 return 1
toolchain = Toolchain(compiler_fname, True, True) if len(compiler_fname_list) != 1:
print ('Internal error, ambiguous toolchains: %s' %
(', '.join(compiler_fname)))
return 1
toolchain = Toolchain(compiler_fname_list[0], True, True)
# Make sure that it will be found by buildman # Make sure that it will be found by buildman
if not self.TestSettingsHasPath(dirpath): if not self.TestSettingsHasPath(dirpath):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment