aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw@src.gnome.org>2019-10-11 16:15:08 +0800
committerDylan Baker <dylan@pnwbakers.com>2019-10-11 10:03:35 -0700
commit9f0f595b351aba8edce1d27e79c3be2a50f9a1f4 (patch)
treec9a14046e32785ac371cfe61f80bc2060b25b18f /mesonbuild/compilers
parent27c01dff01832fa9d0c92602d0dc25b6ded9d2e9 (diff)
downloadmeson-9f0f595b351aba8edce1d27e79c3be2a50f9a1f4.zip
meson-9f0f595b351aba8edce1d27e79c3be2a50f9a1f4.tar.gz
meson-9f0f595b351aba8edce1d27e79c3be2a50f9a1f4.tar.bz2
compilers: Fix version requirements for ClangC and AppleClangC
Commit ff4a17dbef08a1d8afd075f57dbab0f5c76951ab modified the version requirements wrongly. AppleClangC should be the one with higher version numbers. Exchange them to fix the check.
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/c.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 1bf03bd..b1e6a06 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -78,8 +78,8 @@ class CCompiler(CLikeCompiler, Compiler):
class ClangCCompiler(ClangCompiler, CCompiler):
- _C17_VERSION = '>=10.0.0'
- _C18_VERSION = '>=11.0.0'
+ _C17_VERSION = '>=6.0.0'
+ _C18_VERSION = '>=8.0.0'
def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
@@ -127,8 +127,8 @@ class AppleClangCCompiler(ClangCCompiler):
C standards were added.
"""
- _C17_VERSION = '>=6.0.0'
- _C18_VERSION = '>=8.0.0'
+ _C17_VERSION = '>=10.0.0'
+ _C18_VERSION = '>=11.0.0'
class EmscriptenCCompiler(LinkerEnvVarsMixin, BasicLinkerIsCompilerMixin, ClangCCompiler):