diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-16 18:31:32 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-22 06:49:34 +0530 |
| commit | be486a2ec84f22052fba5ba16de136de00379966 (patch) | |
| tree | 0c4a71a532fc702336fbb503af730d4bf017effd /mesonbuild/environment.py | |
| parent | feb82e0f0f365d66199d697f1d99e109e2c6a700 (diff) | |
| download | meson-be486a2ec84f22052fba5ba16de136de00379966.zip meson-be486a2ec84f22052fba5ba16de136de00379966.tar.gz meson-be486a2ec84f22052fba5ba16de136de00379966.tar.bz2 | |
ninjabackend: List PDBs in output list for targets
This is more correct, and forces the target(s) to be rebuilt if the
PDB files are missing. Increases the minimum required Ninja to 1.7,
which is available in Ubuntu 16.04 under backports.
We can't do the same for import libraries, because it is impossible
for us to know at configure time whether or not an import library will
be generated for a given DLL.
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 554d79b..a928248 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -140,11 +140,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: |