From 7cece438ccbf3c058c70e84dcc5ee702a5c3b702 Mon Sep 17 00:00:00 2001 From: Fabio Porcedda Date: Thu, 23 Feb 2017 09:59:55 +0100 Subject: ninjabackend: generate "compile_commands.json" even for cross compile Just add 'c_CROSS_COMPILER' and 'cpp_CROSS_COMPILER' to the 'ninja -t compdb' command. --- mesonbuild/backend/ninjabackend.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mesonbuild/backend/ninjabackend.py') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 27e1e9a..ee2c40e 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -210,9 +210,11 @@ 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'] builddir = self.environment.get_build_dir() try: - jsondb = subprocess.check_output([ninja_exe, '-t', 'compdb', 'c_COMPILER', 'cpp_COMPILER'], cwd=builddir) + jsondb = subprocess.check_output(ninja_compdb, cwd=builddir) with open(os.path.join(builddir, 'compile_commands.json'), 'wb') as f: f.write(jsondb) except Exception: -- cgit v1.1