From 8b8f14c4ddb0241e96e05dfa728c597c12d3fd3b Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Wed, 16 Oct 2019 13:15:54 +0200 Subject: default inc dirs: fix warning for unsupporte lang (fixes #6050) --- mesonbuild/compilers/mixins/gnu.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mesonbuild/compilers') diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py index a23a24e..64b0d3b 100644 --- a/mesonbuild/compilers/mixins/gnu.py +++ b/mesonbuild/compilers/mixins/gnu.py @@ -85,8 +85,15 @@ gnu_color_args = { @functools.lru_cache(maxsize=None) def gnulike_default_include_dirs(compiler: typing.Tuple[str], lang: str) -> typing.List[str]: - if lang == 'cpp': - lang = 'c++' + lang_map = { + 'c': 'c', + 'cpp': 'c++', + 'objc': 'objective-c', + 'objcpp': 'objective-c++' + } + if lang not in lang_map: + return [] + lang = lang_map[lang] env = os.environ.copy() env["LC_ALL"] = 'C' cmd = list(compiler) + ['-x{}'.format(lang), '-E', '-v', '-'] -- cgit v1.1