aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-09-18 10:28:14 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-11-14 15:57:37 -0800
commit95403cb61520978c52b3693a9bf0119e8348c20b (patch)
treeaff931dbdd7241075d5f52c9a1bd24f5c05e63dd /mesonbuild/environment.py
parent5a9c9c70df17c8f1ba900933574586c46c3d096f (diff)
downloadmeson-95403cb61520978c52b3693a9bf0119e8348c20b.zip
meson-95403cb61520978c52b3693a9bf0119e8348c20b.tar.gz
meson-95403cb61520978c52b3693a9bf0119e8348c20b.tar.bz2
replace ExternalProgram.from_cross_info with from_bin_list
This more generic method will also be used to check a config file for binary information.
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 80917ed..073825a 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -340,7 +340,8 @@ class Environment:
self.cross_info = CrossBuildInfo(self.coredata.cross_file)
if 'exe_wrapper' in self.cross_info.config['binaries']:
from .dependencies import ExternalProgram
- self.exe_wrapper = ExternalProgram.from_cross_info(self.cross_info, 'exe_wrapper')
+ self.exe_wrapper = ExternalProgram.from_bin_list(
+ self.cross_info.config['binaries'], 'exe_wrapper')
if 'host_machine' in self.cross_info.config:
self.machines.host = MachineInfo.from_literal(
self.cross_info.config['host_machine'])