diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-02-16 18:45:37 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-02-16 18:45:37 +0200 |
| commit | 1b2b7765a027908cdbeef7c96fd203509c9492de (patch) | |
| tree | 6e16922996da20f320897f28be1ae43318cd6d25 | |
| parent | a21bd6d5c208111fbf96e9b402cc5ca872f95109 (diff) | |
| download | guix-1b2b7765a027908cdbeef7c96fd203509c9492de.tar.gz | |
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.
| -rw-r--r-- | guix/build/gnu-build-system.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 96913ef9f0..2e7dff2034 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") |