summaryrefslogtreecommitdiff
path: root/build-aux/pre-inst-env.in
diff options
context:
space:
mode:
authorEric Bavier <bavier@cray.com>2017-10-10 22:29:50 -0500
committerEric Bavier <bavier@member.fsf.org>2017-10-10 23:16:07 -0500
commit7740228e3523e3e0e4c007eb1f1b224575d16574 (patch)
tree93512f2c59d709595695b9fa8ec3b0a858d198c1 /build-aux/pre-inst-env.in
parentc3bece41b7e3cb8dc4a2660ba4a8389148f48c6e (diff)
downloadpatches-7740228e3523e3e0e4c007eb1f1b224575d16574.tar
patches-7740228e3523e3e0e4c007eb1f1b224575d16574.tar.gz
build: Set 'NIX_BUILD_HOOK' only if offloading is configured.
This prevents libstore/build.cc from executing nix/scripts/offload, which is always created by config.status, when offload support is not enabled. * build-aux/pre-inst-env.in: Export 'NIX_BUILD_HOOK' only when configured; unset it otherwise.
Diffstat (limited to 'build-aux/pre-inst-env.in')
-rw-r--r--build-aux/pre-inst-env.in11
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"