Merge pull request #86283 from Ericson2314/fix-mistakes

meson: Fix my mistakes
This commit is contained in:
John Ericson 2020-04-29 10:02:54 -04:00 committed by GitHub
commit e9d8303727
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View file

@ -3,6 +3,7 @@
, stdenv
, writeTextDir
, substituteAll
, pkgsHostHost
}:
python3Packages.buildPythonApplication rec {
@ -58,6 +59,10 @@ python3Packages.buildPythonApplication rec {
setupHook = ./setup-hook.sh;
# Ensure there will always be a native C compiler when meson is used, as a
# workaround until https://github.com/mesonbuild/meson/pull/6512 lands.
depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ];
# 0.45 update enabled tests but they are failing
doCheck = false;
# checkInputs = [ ninja pkgconfig ];

View file

@ -257,8 +257,8 @@ in rec {
mesonFlags = if mesonFlags == null then null else let
# See https://mesonbuild.com/Reference-tables.html#cpu-families
cpuFamily = platform: with platform;
/**/ if isAarch64 then "arm"
else if isAarch32 then "aarch64"
/**/ if isAarch32 then "arm"
else if isAarch64 then "aarch64"
else if isx86_32 then "x86"
else if isx86_64 then "x86_64"
else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits;