From 7c78c2b5a0314078bdabb998ead56925dc8b0fc0 Mon Sep 17 00:00:00 2001 From: MaxHearnden Date: Tue, 2 May 2023 19:54:51 +0100 Subject: fix regression in precomputing CMAKE_SIZEOF_VOID_P In commit 808d5934dd6c6a6c16f66e9dc51dae6e83e02cef, compiler.sizeof was refactored to introduce caching, but cmake subprojects did not adapt to that API change and ended up embedding the python repr of a tuple as a cmake variable. --- mesonbuild/modules/cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index ee40b442d..a178b2373 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -267,7 +267,7 @@ class CmakeModule(ExtensionModule): if not compiler: raise mesonlib.MesonException('Requires a C or C++ compiler to compute sizeof(void *).') - return compiler.sizeof('void *', '', env) + return compiler.sizeof('void *', '', env)[0] def detect_cmake(self, state): if self.cmake_detected: -- cgit v1.2.1