aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@iki.fi>2016-12-30 22:05:27 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-31 13:39:28 +0200
commit4ae629d2aae7194ec1034c73e2df50b5f028e76b (patch)
treeba96ea30d558e324968f6be497406955d16da089
parent8f5b67434d487d997e41138f20469f0c2a328d9a (diff)
downloadmeson-4ae629d2aae7194ec1034c73e2df50b5f028e76b.zip
meson-4ae629d2aae7194ec1034c73e2df50b5f028e76b.tar.gz
meson-4ae629d2aae7194ec1034c73e2df50b5f028e76b.tar.bz2
Use the correct directory for scan-build command.
-rw-r--r--mesonbuild/scripts/scanbuild.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/scripts/scanbuild.py b/mesonbuild/scripts/scanbuild.py
index e17d2ad..728214f 100644
--- a/mesonbuild/scripts/scanbuild.py
+++ b/mesonbuild/scripts/scanbuild.py
@@ -16,11 +16,12 @@ import os
import subprocess
import shutil
import tempfile
+from ..environment import detect_ninja
def scanbuild(exename, srcdir, blddir, privdir, logdir, args):
with tempfile.TemporaryDirectory(dir=privdir) as scandir:
meson_cmd = [exename] + args
- build_cmd = [exename, '-o', logdir, 'ninja']
+ build_cmd = [exename, '-o', logdir, detect_ninja(), '-C', scandir]
rc = subprocess.call(meson_cmd + [srcdir, scandir])
if rc != 0:
return rc