diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-05-28 23:39:24 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-05-29 13:20:25 +0200 |
| commit | 49c730ef05573410eda88256678ed6d1379cf5ea (patch) | |
| tree | 9414ea0b45ef1e9b926fac301341c4049c01976c /mesonbuild/cmake/interpreter.py | |
| parent | 0e777e7c90d5ac89b457621aa96a513dce0d3e2f (diff) | |
| download | meson-49c730ef05573410eda88256678ed6d1379cf5ea.zip meson-49c730ef05573410eda88256678ed6d1379cf5ea.tar.gz meson-49c730ef05573410eda88256678ed6d1379cf5ea.tar.bz2 | |
cmake: Fix CMakeToolchain (fixes #8293)
Instead of guessing the internal compiler
variables, Meson now runns CMake once to
determine what they actually are.
Diffstat (limited to 'mesonbuild/cmake/interpreter.py')
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 130723f..513df60 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -892,7 +892,7 @@ class CMakeInterpreter: self.trace = CMakeTraceParser(cmake_exe.version(), self.build_dir, permissive=True) preload_file = mesondata['cmake/data/preload.cmake'].write_to_private(self.env) - toolchain = CMakeToolchain(self.env, self.for_machine, CMakeExecScope.SUBPROJECT, self.build_dir.parent, preload_file) + toolchain = CMakeToolchain(cmake_exe, self.env, self.for_machine, CMakeExecScope.SUBPROJECT, self.build_dir, preload_file) toolchain_file = toolchain.write() # TODO: drop this check once the deprecated `cmake_args` kwarg is removed |