diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-02-01 00:12:44 +0100 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-02-15 14:34:06 -0700 |
| commit | d908898333b22fb2345a7a165ff837fa6b947b0b (patch) | |
| tree | 5c6644687573b455222d12f88eccd3e180750dda /tools | |
| parent | 8895b3e16c7a2aab4275d52be19e485605dc5c7b (diff) | |
buildman: allow multiple toolchains in a single path
When buildman scans a toolchain path, it stops at the
first toolchain found. However, a single path can contains
several toolchains, each with its own prefix.
This patch lets buildman scan all toolchains in the path.
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildman/toolchain.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index d4c5d4a11eb..537797ad53e 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -197,13 +197,14 @@ class Toolchains: Returns: Filename of C compiler if found, else None """ + fnames = [] for subdir in ['.', 'bin', 'usr/bin']: dirname = os.path.join(path, subdir) if verbose: print " - looking in '%s'" % dirname for fname in glob.glob(dirname + '/*gcc'): if verbose: print " - found '%s'" % fname - return fname - return None + fnames.append(fname) + return fnames def Scan(self, verbose): @@ -219,8 +220,8 @@ class Toolchains: if verbose: print 'Scanning for tool chains' for path in self.paths: if verbose: print " - scanning path '%s'" % path - fname = self.ScanPath(path, verbose) - if fname: + fnames = self.ScanPath(path, verbose) + for fname in fnames: self.Add(fname, True, verbose) def List(self): |