diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-03 00:12:47 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-09-04 15:38:12 +0200 |
| commit | 492afe50a439d70df99d6e3e59572aff55e14c6b (patch) | |
| tree | 80bb5b3013cacaf2884cc06e167da04b193dafc6 /mesonbuild/scripts/scanbuild.py | |
| parent | fa5c2363eb1dd94058aac1a4045d2ab546eed7b9 (diff) | |
| download | meson-492afe50a439d70df99d6e3e59572aff55e14c6b.zip meson-492afe50a439d70df99d6e3e59572aff55e14c6b.tar.gz meson-492afe50a439d70df99d6e3e59572aff55e14c6b.tar.bz2 | |
environment: use ExternalProgram to find ninja
This allows the NINJA environment variable to support all the Windows special
cases, especially allowing an absolute path without extension.
Based on a patch by Yonggang Luo.
Fixes: #7659
Suggested-by: Nirbheek Chauhan <nirbheek@centricular.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/scripts/scanbuild.py')
| -rw-r--r-- | mesonbuild/scripts/scanbuild.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/scripts/scanbuild.py b/mesonbuild/scripts/scanbuild.py index b9e96d2..0190067 100644 --- a/mesonbuild/scripts/scanbuild.py +++ b/mesonbuild/scripts/scanbuild.py @@ -22,7 +22,7 @@ from ..environment import detect_ninja, detect_scanbuild def scanbuild(exelist, srcdir, blddir, privdir, logdir, args): with tempfile.TemporaryDirectory(dir=privdir) as scandir: meson_cmd = exelist + args - build_cmd = exelist + ['-o', logdir, detect_ninja(), '-C', scandir] + build_cmd = exelist + ['-o', logdir] + detect_ninja() + ['-C', scandir] rc = subprocess.call(meson_cmd + [srcdir, scandir]) if rc != 0: return rc |