diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-08-06 13:19:06 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-08-07 23:44:31 +0300 |
| commit | 2e4a2bb373b08a9e053d7aff3205badc74a0823a (patch) | |
| tree | 53fd0e7a2d69f6707a5142982e22fecd4bb57e32 | |
| parent | 4a923b699b5e2575b7d0058a306ffb3d031aa970 (diff) | |
| download | meson-2e4a2bb373b08a9e053d7aff3205badc74a0823a.zip meson-2e4a2bb373b08a9e053d7aff3205badc74a0823a.tar.gz meson-2e4a2bb373b08a9e053d7aff3205badc74a0823a.tar.bz2 | |
interpreter: Lower case languages before checking if 'c' is in the list
Fixes: #7495
| -rw-r--r-- | mesonbuild/interpreter.py | 2 | ||||
| -rw-r--r-- | test cases/vala/1 basic/meson.build | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index fbe0374..429c9bb 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3246,6 +3246,7 @@ external dependencies (including libraries) must go to "dependencies".''') return should def add_languages_for(self, args, required, for_machine: MachineChoice): + args = [a.lower() for a in args] langs = set(self.coredata.compilers[for_machine].keys()) langs.update(args) if 'vala' in langs: @@ -3254,7 +3255,6 @@ external dependencies (including libraries) must go to "dependencies".''') success = True for lang in sorted(args, key=compilers.sort_clink): - lang = lang.lower() clist = self.coredata.compilers[for_machine] machine_name = for_machine.get_lower_case_name() if lang in clist: diff --git a/test cases/vala/1 basic/meson.build b/test cases/vala/1 basic/meson.build index fe422e1..d1bfabd 100644 --- a/test cases/vala/1 basic/meson.build +++ b/test cases/vala/1 basic/meson.build @@ -1,4 +1,5 @@ -project('valatest', 'vala', 'c') +# Language are case unsensitive, check here that capital C works too. +project('valatest', 'vala', 'C') valadeps = [dependency('glib-2.0'), dependency('gobject-2.0')] |