[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/16: build: Unset 'NIX_BUILD_HOOK' when offloading support is missing.
From: |
Ludovic Courtès |
Subject: |
05/16: build: Unset 'NIX_BUILD_HOOK' when offloading support is missing. |
Date: |
Wed, 8 Mar 2017 17:44:33 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 19c1ac8d88b0925863623530ee65ac40861c2d8d
Author: Ludovic Courtès <address@hidden>
Date: Wed Mar 8 14:45:55 2017 +0100
build: Unset 'NIX_BUILD_HOOK' when offloading support is missing.
* build-aux/pre-inst-env.in: Export 'NIX_BUILD_HOOK' only when
nix/scripts/offload is executable; unset it otherwise.
---
build-aux/pre-inst-env.in | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
index fe56da6..dca2699 100644
--- a/build-aux/pre-inst-env.in
+++ b/build-aux/pre-inst-env.in
@@ -1,7 +1,7 @@
#!/bin/sh
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <address@hidden>
#
# This file is part of GNU Guix.
#
@@ -45,11 +45,18 @@ export PATH
NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots"
NIX_SUBSTITUTERS="$abs_top_builddir/nix/scripts/substitute"
-NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload"
NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'guix-authenticate'
-export NIX_ROOT_FINDER NIX_SUBSTITUTERS \
- NIX_BUILD_HOOK NIX_LIBEXEC_DIR
+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
# The 'guix-register' program.
GUIX_REGISTER="$abs_top_builddir/guix-register"
- branch master updated (6f5d28f -> 7447aa3), Ludovic Courtès, 2017/03/08
- 03/16: services: prosody: Make sure 'id' is available at expansion time., Ludovic Courtès, 2017/03/08
- 02/16: gnu: Remove unneeded imports., Ludovic Courtès, 2017/03/08
- 04/16: services: prosody: Use 'id' to introduce unhygienic top-level identifiers., Ludovic Courtès, 2017/03/08
- 05/16: build: Unset 'NIX_BUILD_HOOK' when offloading support is missing.,
Ludovic Courtès <=
- 09/16: gnu: Add guile2.2-reader., Ludovic Courtès, 2017/03/08
- 01/16: guix archive: Allow compilation with Guile 2.2., Ludovic Courtès, 2017/03/08
- 06/16: hash: Close or flush sha256 output ports before calling their 'get' procedure., Ludovic Courtès, 2017/03/08
- 11/16: download: Update the Savannah mirror list., Ludovic Courtès, 2017/03/08
- 12/16: ui: Avoid '_' as a pattern variable in 'match'., Ludovic Courtès, 2017/03/08
- 15/16: packages: Use address@hidden syntax when reporting ambiguities., Ludovic Courtès, 2017/03/08
- 13/16: ui: Don't use '%default-port-encoding' to set the encoding of string ports., Ludovic Courtès, 2017/03/08
- 16/16: utils: Make sure to use the right 'bytevector->string'., Ludovic Courtès, 2017/03/08
- 14/16: list-runtime-roots: Bufferize the lsof pipe., Ludovic Courtès, 2017/03/08
- 07/16: tests: Avoid zero-expression 'begin' form., Ludovic Courtès, 2017/03/08