From 95403cb61520978c52b3693a9bf0119e8348c20b Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 18 Sep 2018 10:28:14 -0700 Subject: 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. --- mesonbuild/modules/windows.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild/modules') 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: -- cgit v1.1