Skip to content

Commit 9a9b279

Browse files
committed
test versions
1 parent 466dbf2 commit 9a9b279

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

builder/core/data.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,8 @@ class PKG_TOOLS(Enum):
508508
'3': {
509509
'c': "clang-3.9",
510510
'cxx': "clang++-3.9",
511-
},
512-
'3.9': {
513-
'c': "clang-3.9",
514-
'cxx': "clang++-3.9",
511+
# specific version number in use
512+
'releases': ['3.9']
515513
},
516514
'6': {
517515
'c': "clang-6.0",

builder/core/toolchain.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,15 @@ def _find_compiler_tool(name, versions):
5757
return None, None
5858

5959

60-
def _clang_versions():
61-
versions = [v for v in COMPILERS['clang']
62-
['versions'].keys() if v != 'default']
60+
def _clang_versions(version=None):
61+
versions = []
62+
if version:
63+
versions = [version]
64+
versions.append(COMPILERS['clang']['versions']
65+
[version]['releases'])
66+
else:
67+
versions = [v for v in COMPILERS['clang']
68+
['versions'].keys() if v != 'default']
6369
versions.sort()
6470
versions.reverse()
6571
print("DEBUG_CLANG: versions {}".format(versions))
@@ -191,7 +197,7 @@ def find_gcc_tool(name, version=None):
191197
def find_llvm_tool(name, version=None):
192198
""" Finds clang, clang-tidy, lld, etc at a specific version, or the
193199
latest one available """
194-
versions = [version] if version else _clang_versions()
200+
versions = _clang_versions()
195201
return _find_compiler_tool(name, versions)
196202

197203
@staticmethod

0 commit comments

Comments
 (0)