diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-05-11 09:14:18 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-11-14 15:57:37 -0800 |
| commit | 091452f8cd886dedc2bc5d3ec292dcf899989a24 (patch) | |
| tree | 876f93539a8579babb9b9927845912bbe1cc7a3a /mesonbuild | |
| parent | f159735c3b82849d0c5d33345b7b07a5f5024428 (diff) | |
| download | meson-091452f8cd886dedc2bc5d3ec292dcf899989a24.zip meson-091452f8cd886dedc2bc5d3ec292dcf899989a24.tar.gz meson-091452f8cd886dedc2bc5d3ec292dcf899989a24.tar.bz2 | |
modules/python3: allow specifying in the native file
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/python3.py | 5 | ||||
| -rw-r--r-- | mesonbuild/modules/windows.py | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/modules/python3.py b/mesonbuild/modules/python3.py index 5bda5ab..f664632 100644 --- a/mesonbuild/modules/python3.py +++ b/mesonbuild/modules/python3.py @@ -48,7 +48,10 @@ class Python3Module(ExtensionModule): @noKwargs def find_python(self, state, args, kwargs): - py3 = dependencies.ExternalProgram('python3', mesonlib.python_command, silent=True) + options = [state.environment.config_info.binaries.get('python3')] + if not options[0]: # because this would be [None] + options = ['python3', mesonlib.python_command] + py3 = dependencies.ExternalProgram(*options, silent=True) return ModuleReturnValue(py3, [py3]) @noKwargs diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index 96f3a7e..d185d89 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -62,9 +62,8 @@ class WindowsModule(ExtensionModule): # Take windres from the config file after the environment, which is # in keeping with the expectations on unix-like OSes that # environment variables trump config files. - _win = state.environment.config_info.binaries.get('windres') - if _win: - rescomp = ExternalProgram('windres', command=_win, silent=True) + bins = state.environment.config_info.binaries + rescomp = ExternalProgram.from_bin_list(bins, 'windres') if not rescomp or not rescomp.found(): comp = self.detect_compiler(state.compilers) |