diff options
| author | Simon Warta <[email protected]> | 2017-09-07 23:55:01 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2017-09-07 23:57:18 +0200 |
| commit | 13192be8bd753fd20ecd19a059cbcb2c22d41bfd (patch) | |
| tree | 5dd3dd45138cdb523646372692e5f3fb3c76a1ca | |
| parent | 59ca3d8b4b733ad72b0eda950e9f730dc5898762 (diff) | |
Adjust min version for non "based on LLVM" appleclang
| -rwxr-xr-x | configure.py | 4 | ||||
| -rwxr-xr-x | src/scripts/python_unittests.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.py b/configure.py index 1314e05b8..121bef0af 100755 --- a/configure.py +++ b/configure.py @@ -2713,7 +2713,9 @@ class CompilerDetector(object): 900: '4.0', } - cc_version = '3.8' # safe default + # All appleclang versions without "based on LLVM" note are at least clang 3.7 + # https://en.wikipedia.org/wiki/Xcode#Latest_versions + cc_version = '3.7' match = re.search(r'Apple LLVM version [0-9\.]+ \(clang-([0-9]+)\.', cc_output) if match: user_appleclang = int(match.group(1)) diff --git a/src/scripts/python_unittests.py b/src/scripts/python_unittests.py index 649ccf662..37068ed1c 100755 --- a/src/scripts/python_unittests.py +++ b/src/scripts/python_unittests.py @@ -121,7 +121,7 @@ InstalledDir: /Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDe Target: x86_64-apple-darwin16.7.0 Thread model: posix InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin""" - self.assertEqual(detector.version_from_compiler_output(compiler_out), "3.8") + self.assertEqual(detector.version_from_compiler_output(compiler_out), "3.7") compiler_out = """Apple LLVM version 8.1.1 (clang-802.1.0) Target: x86_64-apple-darwin16.7.0 |