aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/scripts/scanbuild.py3
-rw-r--r--setup.cfg4
2 files changed, 5 insertions, 2 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
diff --git a/setup.cfg b/setup.cfg
index ca6c700..4cdf178 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,5 +3,7 @@ ignore =
# E261: at least two spaces before inline comment
E261,
# E501: line too long
- E501
+ E501,
+ # E302: expected 2 blank lines, found 1
+ E302
max-line-length = 120