Unverified Commit f16f9410 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #310453 from RaitoBezarius/lix-preps 

build-support/meson: explicitly use ambiant CMake during cross compilation
parents 0785f02a d4c673a9

pkgs/build-support/lib/meson.nix

+4 −0
Original line number Diff line number Diff line
@@ -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}" ];