stdenv.mkDerivation: be less strict about check execution for cross
Instead of requiring the platforms be equal, use `isCompatible` to determine if we can execute tests. The upside of this is that we now can execute tests for natively cross compiled package sets like pkgsStatic, pkgsLLVM and pkgsCross.musl64 etc.
This commit is contained in:
parent
acb063701a
commit
41485e7337
|
@ -167,8 +167,8 @@ makeOverlayable (overrideAttrs:
|
||||||
let
|
let
|
||||||
# TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
|
# TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
|
||||||
# no package has `doCheck = true`.
|
# no package has `doCheck = true`.
|
||||||
doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform;
|
doCheck' = doCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||||
doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform;
|
doInstallCheck' = doInstallCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||||
|
|
||||||
separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false);
|
separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false);
|
||||||
outputs' = outputs ++ lib.optional separateDebugInfo' "debug";
|
outputs' = outputs ++ lib.optional separateDebugInfo' "debug";
|
||||||
|
|
Loading…
Reference in a new issue