Merge branch 'arm32-personality' of https://github.com/cleverca22/nix

This commit is contained in:
Eelco Dolstra 2021-12-13 19:58:40 +01:00
commit 9529de2eed

View File

@ -1785,6 +1785,10 @@ void LocalDerivationGoal::runChild()
if (personality(PER_LINUX32) == -1) if (personality(PER_LINUX32) == -1)
throw SysError("cannot set i686-linux personality"); throw SysError("cannot set i686-linux personality");
} }
if (drv->platform == "armv7l-linux" || drv->platform == "armv6l-linux") {
if (personality(PER_LINUX32) == -1)
throw SysError("cannot set 32bit linux personality");
}
/* Impersonate a Linux 2.6 machine to get some determinism in /* Impersonate a Linux 2.6 machine to get some determinism in
builds that depend on the kernel version. */ builds that depend on the kernel version. */