From 83291101c39c1cd1bf472280c24ad68d94248c2e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 27 Aug 2014 10:26:54 -0500 Subject: utils: Preserve makefile shell arguments during patch. * guix/build/utils.scm (patch-makefile-SHELL): Preserve shell arguments. --- guix/build/utils.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'guix/build') 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)))) -- cgit v1.2.3