lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

meson: remove unnecessary parts of cross file

Browse source 
Meson cross files layer, the last value of each key takes effect.

https: //mesonbuild.com/Machine-files.html#loading-multiple-machine-files
Change-Id: I22d886f71cd51f0ce520d3fc22aed4bcf074bb91
This commit is contained in:
Qyriad 2024-04-23 10:20:20 -06:00
parent be4a3168c9
commit f24223931d
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
package.nix
View file

@ -116,21 +116,12 @@ let
in in
builtins.toFile "lix-cross-file.conf" '' builtins.toFile "lix-cross-file.conf" ''
[properties] [properties]
bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}']
# Meson is convinced that if !buildPlatform.canExecute hostPlatform then we cannot # Meson is convinced that if !buildPlatform.canExecute hostPlatform then we cannot
# build anything at all, which is not at all correct. If we can't execute the host # build anything at all, which is not at all correct. If we can't execute the host
# platform, we'll just disable tests and doc gen. # platform, we'll just disable tests and doc gen.
needs_exe_wrapper = false needs_exe_wrapper = false
[host_machine]
system = '${stdenv.targetPlatform.parsed.kernel.name}'
cpu_family = '${cpuFamily stdenv.targetPlatform}'
cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
[binaries] [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 # Meson refuses to consider any CMake binary during cross compilation if it's
# not explicitly specified here, in the cross file. # not explicitly specified here, in the cross file.
# https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72 # https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72