Skip to content

Commit

Permalink
compilers: Fix version requirements for ClangC and AppleClangC
Browse files Browse the repository at this point in the history
Commit ff4a17d modified the version
requirements wrongly. AppleClangC should be the one with higher version
numbers. Exchange them to fix the check.
  • Loading branch information
lantw44 authored and dcbaker committed Oct 11, 2019
1 parent 27c01df commit 9f0f595
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mesonbuild/compilers/c.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def has_header_symbol(self, hname, symbol, prefix, env, *, extra_args=None, depe

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):
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit 9f0f595

Please sign in to comment.