aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Porcedda <fabio.porcedda@gmail.com>2017-02-23 09:59:55 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-02-26 07:27:51 -0500
commit7cece438ccbf3c058c70e84dcc5ee702a5c3b702 (patch)
treeef563a549db10dcbf01901d313d24fc3c168a528
parent95248f0f26dc89efcbb62675bcb656e028c5444b (diff)
downloadmeson-7cece438ccbf3c058c70e84dcc5ee702a5c3b702.zip
meson-7cece438ccbf3c058c70e84dcc5ee702a5c3b702.tar.gz
meson-7cece438ccbf3c058c70e84dcc5ee702a5c3b702.tar.bz2
ninjabackend: generate "compile_commands.json" even for cross compile
Just add 'c_CROSS_COMPILER' and 'cpp_CROSS_COMPILER' to the 'ninja -t compdb' command.
-rw-r--r--mesonbuild/backend/ninjabackend.py4
1 files changed, 3 insertions, 1 deletions
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: