diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-08-06 00:23:20 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-08-06 00:23:20 -0400 |
| commit | f167595ba1a4e0e419adc17de6af275bedf32822 (patch) | |
| tree | 6a582fbda8ad9d72962359add99e5ae219dd030d /nix | |
| parent | e3df6938acc2ba2d2f7333d911b8bdc3697f0f75 (diff) | |
| parent | 01a61d7040b1794f36547b107abce6e967d59f21 (diff) | |
| download | guix-f167595ba1a4e0e419adc17de6af275bedf32822.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/build.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index a93095dd1e..693fa70c8d 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -26,7 +26,6 @@ #include <errno.h> #include <stdio.h> #include <cstring> -#include <stdint.h> #include <pwd.h> #include <grp.h> @@ -2009,11 +2008,11 @@ void DerivationGoal::startBuilder() char stack[32 * 1024]; int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD; if (!fixedOutput) flags |= CLONE_NEWNET; - - /* Ensure proper alignment on the stack. On aarch64, it has to be 16 - bytes. */ - pid = clone(childEntry, (char *)(((uintptr_t)stack + 16) & ~0xf), - flags, this); +#ifdef __aarch64__ + pid = clone(childEntry, stack + sizeof(stack) - 16, flags, this); +#else + pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this); +#endif if (pid == -1) throw SysError("cloning builder process"); } else |