diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-10-16 13:15:54 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-18 00:45:03 +0300 |
| commit | 8b8f14c4ddb0241e96e05dfa728c597c12d3fd3b (patch) | |
| tree | 4ea26ca0534a3a3ef717a2273eb3346bdec447d8 | |
| parent | 5478397c591dcfeddf18f0b50c42ab49ded3b001 (diff) | |
| download | meson-8b8f14c4ddb0241e96e05dfa728c597c12d3fd3b.zip meson-8b8f14c4ddb0241e96e05dfa728c597c12d3fd3b.tar.gz meson-8b8f14c4ddb0241e96e05dfa728c597c12d3fd3b.tar.bz2 | |
default inc dirs: fix warning for unsupporte lang (fixes #6050)
| -rw-r--r-- | mesonbuild/compilers/mixins/gnu.py | 11 |
1 files changed, 9 insertions, 2 deletions
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', '-'] |