From 51b9f2f1a5cd43d903033f4738a4235fe656cb07 Mon Sep 17 00:00:00 2001 From: Charles Brunet Date: Wed, 19 Apr 2023 08:52:21 -0400 Subject: Find python3.xx on windows --- mesonbuild/modules/python.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild/modules/python.py') diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 239c68af7..178f1bdce 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -300,12 +300,12 @@ class PythonModule(ExtensionModule): # https://www.python.org/dev/peps/pep-0397/ @staticmethod def _get_win_pythonpath(name_or_path: str) -> T.Optional[str]: - if name_or_path not in ['python2', 'python3']: + if not name_or_path.startswith(('python2', 'python3')): return None if not shutil.which('py'): # program not installed, return without an exception return None - ver = {'python2': '-2', 'python3': '-3'}[name_or_path] + ver = f'-{name_or_path[6:]}' cmd = ['py', ver, '-c', "import sysconfig; print(sysconfig.get_config_var('BINDIR'))"] _, stdout, _ = mesonlib.Popen_safe(cmd) directory = stdout.strip() -- cgit v1.2.3