aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/windows.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/modules/windows.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/modules/windows.py')
-rw-r--r--mesonbuild/modules/windows.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
index 4d0f244..85cc3bc 100644
--- a/mesonbuild/modules/windows.py
+++ b/mesonbuild/modules/windows.py
@@ -49,8 +49,8 @@ class WindowsModule(ExtensionModule):
if state.environment.is_cross_build():
# If cross compiling see if windres has been specified in the
# cross file before trying to find it another way.
- cross_info = state.environment.cross_info
- rescomp = ExternalProgram.from_cross_info(cross_info, 'windres')
+ bins = state.environment.cross_info.config['binaries']
+ rescomp = ExternalProgram.from_bin_list(bins, 'windres')
if not rescomp or not rescomp.found():
if 'WINDRES' in os.environ: