aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/python.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-11-15 22:47:51 +0200
committerGitHub <noreply@github.com>2018-11-15 22:47:51 +0200
commitc104251d2ef1ca1c4b8caea52fa6ab2da1dbaefe (patch)
tree0beb5ebae4bdbaf8e2385f644e7e6a8c406d0213 /mesonbuild/modules/python.py
parent6a2dc7576e00e849510f7bc1f939d66d0b2f6f80 (diff)
parent0ab27add49cedb6f5985dfba7ba40c8d29ae91dc (diff)
downloadmeson-c104251d2ef1ca1c4b8caea52fa6ab2da1dbaefe.zip
meson-c104251d2ef1ca1c4b8caea52fa6ab2da1dbaefe.tar.gz
meson-c104251d2ef1ca1c4b8caea52fa6ab2da1dbaefe.tar.bz2
Merge pull request #4216 from dcbaker/wip/config-file
native file support
Diffstat (limited to 'mesonbuild/modules/python.py')
-rw-r--r--mesonbuild/modules/python.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index 954220b..3b2bf07 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -480,7 +480,9 @@ class PythonModule(ExtensionModule):
if len(args) > 1:
raise InvalidArguments('find_installation takes zero or one positional argument.')
- if args:
+ if 'python' in state.environment.config_info.binaries:
+ name_or_path = state.environment.config_info.binaries['python']
+ elif args:
name_or_path = args[0]
if not isinstance(name_or_path, str):
raise InvalidArguments('find_installation argument must be a string.')