aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-05-16 00:31:01 +0300
committerGitHub <noreply@github.com>2019-05-16 00:31:01 +0300
commit67a5af99aa9060c9f4b2350a230343b11282cb8f (patch)
tree992a7f255a89a02db5386e02ff83c76c08a640a1 /mesonbuild/environment.py
parent957d8e051c0c29beb0106e75ae7a71acc5c62cf5 (diff)
parentc571b0b18507a13b6aac749a45ea85cb93ffede3 (diff)
downloadmeson-67a5af99aa9060c9f4b2350a230343b11282cb8f.zip
meson-67a5af99aa9060c9f4b2350a230343b11282cb8f.tar.gz
meson-67a5af99aa9060c9f4b2350a230343b11282cb8f.tar.bz2
Merge pull request #5395 from dcbaker/mtest-annotations
Mtest annotations and bug fixes
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index f86b613..e638f31 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -115,7 +115,7 @@ def find_coverage_tools():
return gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe
-def detect_ninja(version='1.5', log=False):
+def detect_ninja(version: str = '1.5', log: bool = False) -> str:
env_ninja = os.environ.get('NINJA', None)
for n in [env_ninja] if env_ninja else ['ninja', 'ninja-build', 'samu']:
try: