zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix detection of Apple Clang 11.0.0 (#12912)

Browse Source
This commit is contained in:
Adam J. Stewart 2019-09-23 17:25:33 -05:00 committed by GitHub
parent 958b81a564
commit d6555f64b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/compilers/clang.py
View File

@ -205,7 +205,7 @@ def extract_version_from_output(cls, output):
ver = 'unknown' ver = 'unknown'
match = re.search( match = re.search(
# Apple's LLVM compiler has its own versions, so suffix them. # Apple's LLVM compiler has its own versions, so suffix them.
r'^Apple LLVM version ([^ )]+)|' r'^Apple (?:LLVM|clang) version ([^ )]+)|'
# Normal clang compiler versions are left as-is # Normal clang compiler versions are left as-is
r'clang version ([^ )]+)-svn[~.\w\d-]*|' r'clang version ([^ )]+)-svn[~.\w\d-]*|'
r'clang version ([^ )]+)-[~.\w\d-]*|' r'clang version ([^ )]+)-[~.\w\d-]*|'

5
lib/spack/spack/test/compilers.py
View File

@ -329,6 +329,11 @@ def test_fj_flags():
@pytest.mark.regression('10191') @pytest.mark.regression('10191')
@pytest.mark.parametrize('version_str,expected_version', [ @pytest.mark.parametrize('version_str,expected_version', [
# macOS clang # macOS clang
('Apple clang version 11.0.0 (clang-1100.0.33.8)\n'
'Target: x86_64-apple-darwin18.7.0\n'
'Thread model: posix\n'
'InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin\n', # noqa
'11.0.0-apple'),
('Apple LLVM version 7.0.2 (clang-700.1.81)\n' ('Apple LLVM version 7.0.2 (clang-700.1.81)\n'
'Target: x86_64-apple-darwin15.2.0\n' 'Target: x86_64-apple-darwin15.2.0\n'
'Thread model: posix\n', '7.0.2-apple'), 'Thread model: posix\n', '7.0.2-apple'),