diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-02 20:25:22 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-04 05:51:56 -0500 |
| commit | b3aaab3a038f9139f5735d590b5036c25fd033a0 (patch) | |
| tree | 30aab8037a60107cc2a270fb07f1af225ead3f80 | |
| parent | a795ea3cd46fbde40a1cad3531ab4bf6dbe0d3db (diff) | |
| download | meson-b3aaab3a038f9139f5735d590b5036c25fd033a0.zip meson-b3aaab3a038f9139f5735d590b5036c25fd033a0.tar.gz meson-b3aaab3a038f9139f5735d590b5036c25fd033a0.tar.bz2 | |
Have all compiler invocations in compdb. Closes #1439.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 | ||||
| -rwxr-xr-x | run_unittests.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 5e137ca..d696076 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/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: |