diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-15 21:48:03 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-20 23:08:17 +0200 |
| commit | 9d67e5030b6c86ce33f43ae7a5b827f299d68a3e (patch) | |
| tree | ff5f539482b51c48a8d8b4b90cf2ba93c2909157 | |
| parent | a437cd1955186060a8c5768fef739830d2711d0c (diff) | |
| download | meson-9d67e5030b6c86ce33f43ae7a5b827f299d68a3e.zip meson-9d67e5030b6c86ce33f43ae7a5b827f299d68a3e.tar.gz meson-9d67e5030b6c86ce33f43ae7a5b827f299d68a3e.tar.bz2 | |
Changed code to use detected executables rather than hardcoding sys.executable.
| -rw-r--r-- | mesonbuild/mesonlib.py | 9 | ||||
| -rw-r--r-- | mesonbuild/modules/python3.py | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index f74c6c1..35aa036 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -22,6 +22,15 @@ import collections from glob import glob +if sys.executable.endswith('meson.exe'): + # In Windows and using the MSI installed executable. + meson_command = [sys.executable] + python_command = [sys.executable, 'runpython'] +else: + meson_command = [sys.executable, os.path.join(os.path.split(__file__)[0], '..', 'meson.py')] + python_command = [sys.executable] + + # Put this in objects that should not get dumped to pickle files # by accident. import threading diff --git a/mesonbuild/modules/python3.py b/mesonbuild/modules/python3.py index 4fae88b..989e839 100644 --- a/mesonbuild/modules/python3.py +++ b/mesonbuild/modules/python3.py @@ -52,7 +52,7 @@ class Python3Module(ExtensionModule): @noKwargs def find_python(self, state, args, kwargs): - py3 = dependencies.ExternalProgram('python3', sys.executable, silent=True) + py3 = dependencies.ExternalProgram('python3', mesonlib.python_command, silent=True) return ModuleReturnValue(py3, [py3]) @noKwargs |