Merge pull request #310453 from RaitoBezarius/lix-preps

build-support/meson: explicitly use ambiant CMake during cross compilation
This commit is contained in:
Ryan Lahfa 2024-05-11 15:24:44 +02:00 committed by GitHub
commit f16f9410d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -23,6 +23,10 @@ let
[binaries]
llvm-config = 'llvm-config-native'
rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}']
# Meson refuses to consider any CMake binary during cross compilation if it's
# not explicitly specified here, in the cross file.
# https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72
cmake = 'cmake'
'';
crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ];