diff options
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 8 | ||||
| -rwxr-xr-x | run_unittests.py | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 16a31a1..4d54acb 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -210,8 +210,9 @@ int dummy; # http://clang.llvm.org/docs/JSONCompilationDatabase.html def generate_compdb(self): ninja_exe = environment.detect_ninja() - ninja_compdb = [ninja_exe, '-t', 'compdb', 'c_COMPILER', 'cpp_COMPILER', 'c_CROSS_COMPILER', - 'cpp_CROSS_COMPILER'] + native_compilers = ['%s_COMPILER' % i for i in self.build.compilers] + cross_compilers = ['%s_CROSS_COMPILER' % i for i in self.build.cross_compilers] + ninja_compdb = [ninja_exe, '-t', 'compdb'] + native_compilers + cross_compilers builddir = self.environment.get_build_dir() try: jsondb = subprocess.check_output(ninja_compdb, cwd=builddir) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 8cf89e1..13ffabc 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -915,8 +915,14 @@ class GnomeModule(ExtensionModule): custom_kwargs = { 'input': sources, - 'capture': True, } + + # https://github.com/GNOME/glib/commit/0fbc98097fac4d3e647684f344e508abae109fdf + if mesonlib.version_compare(self._get_native_glib_version(state), '>= 2.51.0'): + cmd += ['--output', '@OUTPUT@'] + else: + custom_kwargs['capture'] = True + for arg in known_custom_target_kwargs: if arg in kwargs: custom_kwargs[arg] = kwargs[arg] diff --git a/run_unittests.py b/run_unittests.py index f800d03..82c1b80 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -951,6 +951,8 @@ class LinuxlikeTests(BasePlatformTests): for each in compdb: if each['file'].endswith('GLib.Thread.c'): vala_command = each['command'] + elif each['file'].endswith('GLib.Thread.vala'): + continue elif each['file'].endswith('retcode.c'): c_command = each['command'] else: |