branch core-updates updated: build: gnu-build-system: Adjust NOCONFIGURE variable.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 1b2b776  build: gnu-build-system: Adjust NOCONFIGURE variable.
1b2b776 is described below

commit 1b2b7765a027908cdbeef7c96fd203509c9492de
Author: Efraim Flashner <address@hidden>
AuthorDate: Sun Feb 16 18:45:37 2020 +0200

    build: gnu-build-system: Adjust NOCONFIGURE variable.
    
    This ia a follow-up to 481a0f1a7ceac666a011b28324220584ead07698.
    
    * guix/build/gnu-build-system.scm (bootstrap): Set NOCONFIGURE for all
    bootstrap scripts. Clean up variable after use.
---
 guix/build/gnu-build-system.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 96913ef..2e7dff2 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -191,13 +191,15 @@ working directory."
 
         (if script
             (let ((script (string-append "./" script)))
+              (setenv "NOCONFIGURE" "true")
               (format #t "running '~a'~%" script)
               (if (executable-file? script)
                   (begin
                     (patch-shebang script)
-                    (setenv "NOCONFIGURE" "true")
                     (invoke script))
-                  (invoke "sh" script)))
+                  (invoke "sh" script))
+              ;; Let's clean up after ourselves.
+              (unsetenv "NOCONFIGURE"))
             (if (or (file-exists? "configure.ac")
                     (file-exists? "configure.in"))
                 (invoke "autoreconf" "-vif")