diff options
| author | MaxHearnden <maxoscarhearnden@gmail.com> | 2023-05-02 19:54:51 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-05-02 19:21:25 -0400 |
| commit | 7c78c2b5a0314078bdabb998ead56925dc8b0fc0 (patch) | |
| tree | d98bd55d9d29004928efc839669923b84ee639fb /mesonbuild/modules | |
| parent | 3b1b1b5fec6e80e79570351bcdb8c7c25690ac46 (diff) | |
| download | meson-7c78c2b5a0314078bdabb998ead56925dc8b0fc0.zip meson-7c78c2b5a0314078bdabb998ead56925dc8b0fc0.tar.gz meson-7c78c2b5a0314078bdabb998ead56925dc8b0fc0.tar.bz2 | |
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.
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/cmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index ee40b44..a178b23 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: |