diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2014-08-27 10:26:54 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2014-08-28 11:16:19 -0500 |
| commit | 83291101c39c1cd1bf472280c24ad68d94248c2e (patch) | |
| tree | 45a5985e434e6ee6381a6bb2b6dd2e3af832d35f | |
| parent | f5beb0caf31f227dbe3dd909ec318e84247a504a (diff) | |
| download | patches-83291101c39c1cd1bf472280c24ad68d94248c2e.tar patches-83291101c39c1cd1bf472280c24ad68d94248c2e.tar.gz | |
utils: Preserve makefile shell arguments during patch.
* guix/build/utils.scm (patch-makefile-SHELL): Preserve shell arguments.
| -rw-r--r-- | guix/build/utils.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 2f3dc9cad0..f38b2cabfc 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -582,14 +582,15 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged." (let ((st (stat file))) (substitute* file - (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)[[:blank:]]*" _ dir shell) + (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)[[:blank:]]*(.*)$" + _ dir shell args) (let* ((old (string-append dir shell)) (new (or (find-shell shell) old))) (unless (string=? new old) (format (current-error-port) "patch-makefile-SHELL: ~a: changing `SHELL' from `~a' to `~a'~%" file old new)) - (string-append "SHELL = " new "\n")))) + (string-append "SHELL = " new " " args)))) (when keep-mtime? (set-file-time file st)))) |