diff options
| author | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
|---|---|---|
| committer | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
| commit | 8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb (patch) | |
| tree | 7177d90f3a8f0ba34630e78b5516dbda68ff0570 /build-aux | |
| parent | 404e3d8b1bcd92ad934711fe759feb220f4d1c60 (diff) | |
| parent | 484a72a036e6a8af43f517d6547446f3de344a07 (diff) | |
| download | guix-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar.gz | |
Merge 'master' into core-updates
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/pre-inst-env.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index dca2699687..14315d40d4 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -2,6 +2,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2017 Eric Bavier <bavier@cray.com> # # This file is part of GNU Guix. # @@ -50,13 +51,9 @@ NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'guix-authenticate' export NIX_ROOT_FINDER NIX_SUBSTITUTERS NIX_LIBEXEC_DIR NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload" -if [ -x "$NIX_BUILD_HOOK" ] -then - export NIX_BUILD_HOOK -else - # No offloading support. - unset NIX_BUILD_HOOK -fi +@BUILD_DAEMON_OFFLOAD_TRUE@export NIX_BUILD_HOOK +@BUILD_DAEMON_OFFLOAD_FALSE@# No offloading support. +@BUILD_DAEMON_OFFLOAD_FALSE@unset NIX_BUILD_HOOK # The 'guix-register' program. GUIX_REGISTER="$abs_top_builddir/guix-register" |