diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-23 20:23:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 20:23:03 +0200 |
| commit | 9c604320a0cd47a5b22b52e157d43b73b0533e82 (patch) | |
| tree | 0e90134be40901fcbea20faf36c539b474b80683 /mesonbuild/environment.py | |
| parent | ee94cb6c15732c8b5f329164af7f2b0a63f4fa6d (diff) | |
| parent | 04e89d0867e358df347dbc8cb91e6df7bc365d9a (diff) | |
| download | meson-9c604320a0cd47a5b22b52e157d43b73b0533e82.zip meson-9c604320a0cd47a5b22b52e157d43b73b0533e82.tar.gz meson-9c604320a0cd47a5b22b52e157d43b73b0533e82.tar.bz2 | |
Merge pull request #6637 from mesonbuild/nirbheek/implement-symbolextractor-windows
Implement symbolextractor on windows + some cleanups/fixes
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index eb626b0..46bbea0 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -141,11 +141,11 @@ def find_coverage_tools(): return gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe -def detect_ninja(version: str = '1.5', log: bool = False) -> str: +def detect_ninja(version: str = '1.7', log: bool = False) -> str: r = detect_ninja_command_and_version(version, log) return r[0] if r else None -def detect_ninja_command_and_version(version: str = '1.5', log: bool = False) -> (str, str): +def detect_ninja_command_and_version(version: str = '1.7', log: bool = False) -> (str, str): env_ninja = os.environ.get('NINJA', None) for n in [env_ninja] if env_ninja else ['ninja', 'ninja-build', 'samu']: try: |