01/01: build: Set 'NIX_BUILD_HOOK' only if offloading is configured.

[Eric Bavier]

bavier pushed a commit to branch master
in repository guix.

commit 7740228e3523e3e0e4c007eb1f1b224575d16574
Author: Eric Bavier <address@hidden>
Date:   Tue Oct 10 22:29:50 2017 -0500

    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.
---
 build-aux/pre-inst-env.in | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
index dca2699..14315d4 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 <address@hidden>
+# Copyright © 2017 Eric Bavier <address@hidden>
 #
 # 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
address@hidden@export NIX_BUILD_HOOK
address@hidden@# No offloading support.
address@hidden@unset NIX_BUILD_HOOK
 
 # The 'guix-register' program.
 GUIX_REGISTER="$abs_top_builddir/guix-register"