diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-12-13 19:58:40 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2021-12-13 19:58:40 +0100 |
| commit | 9529de2eed48edd1d7da9b77e62a17b9bc415ad1 (patch) | |
| tree | 25cb8c573ec9d873ed5ee13189356b7bef79dcc5 /src | |
| parent | 18cb094aab2e50c9b90e484592212bfce026b640 (diff) | |
| parent | 374fe49ff78c13457c6cfe396f9ed0cb986c903b (diff) | |
Merge branch 'arm32-personality' of https://github.com/cleverca22/nix
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/build/local-derivation-goal.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc index c9a4a31e7..edfa46052 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -1785,6 +1785,10 @@ void LocalDerivationGoal::runChild() if (personality(PER_LINUX32) == -1) 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 builds that depend on the kernel version. */ |