me
/
guix
Archived
1
0
Fork 0
Code

build: gnu-build-system: Adjust NOCONFIGURE variable. 

This ia a follow-up to 481a0f1a7c.

* guix/build/gnu-build-system.scm (bootstrap): Set NOCONFIGURE for all
bootstrap scripts. Clean up variable after use.
master
Efraim Flashner 2020-02-16 18:45:37 +02:00
parent a21bd6d5c2
commit 1b2b7765a0
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/build/gnu-build-system.scm
View File

@ -191,13 +191,15 @@ working directory."
(if script (if script
(let ((script (string-append "./" script))) (let ((script (string-append "./" script)))
(setenv "NOCONFIGURE" "true")
(format #t "running '~a'~%" script) (format #t "running '~a'~%" script)
(if (executable-file? script) (if (executable-file? script)
(begin (begin
(patch-shebang script) (patch-shebang script)
(setenv "NOCONFIGURE" "true")
(invoke script)) (invoke script))
(invoke "sh" script))) (invoke "sh" script))
;; Let's clean up after ourselves.
(unsetenv "NOCONFIGURE"))
(if (or (file-exists? "configure.ac") (if (or (file-exists? "configure.ac")
(file-exists? "configure.in")) (file-exists? "configure.in"))
(invoke "autoreconf" "-vif") (invoke "autoreconf" "-vif")