diff options
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/cmake.py | 5 | ||||
| -rw-r--r-- | mesonbuild/modules/windows.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index 6af4adb..d72ceca 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -52,7 +52,8 @@ class CmakeModule(ExtensionModule): super().__init__(interpreter) self.snippets.add('configure_package_config_file') - def detect_voidp_size(self, compilers, env): + def detect_voidp_size(self, env): + compilers = env.coredata.compilers compiler = compilers.get('c', None) if not compiler: compiler = compilers.get('cpp', None) @@ -115,7 +116,7 @@ class CmakeModule(ExtensionModule): conf = { 'CVF_VERSION': (version, ''), - 'CMAKE_SIZEOF_VOID_P': (str(self.detect_voidp_size(state.compilers, state.environment)), '') + 'CMAKE_SIZEOF_VOID_P': (str(self.detect_voidp_size(state.environment)), '') } mesonlib.do_conf_file(template_file, version_file, conf, 'meson') diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index e2fd9a8..3b4eb15 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -50,7 +50,7 @@ class WindowsModule(ExtensionModule): rescomp = ExternalProgram.from_bin_list(state.environment.binaries.host, 'windres') if not rescomp or not rescomp.found(): - comp = self.detect_compiler(state.compilers) + comp = self.detect_compiler(state.environment.coredata.compilers) if comp.id in {'msvc', 'clang-cl', 'intel-cl'}: rescomp = ExternalProgram('rc', silent=True) else: |