diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/utils.scm | 3 | ||||
| -rw-r--r-- | guix/gexp.scm | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 419c10195b..dc55c6745d 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -800,7 +801,7 @@ sub-expression. For example: ((\"hello\") \"good morning\\n\") ((\"foo([a-z]+)bar(.*)$\" all letters end) - (string-append \"baz\" letter end))) + (string-append \"baz\" letters end))) Here, anytime a line of FILE contains \"hello\", it is replaced by \"good morning\". Anytime a line of FILE matches the second regexp, ALL is bound to diff --git a/guix/gexp.scm b/guix/gexp.scm index 67b6121313..42a5e7f442 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1546,17 +1546,12 @@ TARGET, a GNU triplet." (ungexp (* total 2)) entry) - (ungexp-splicing - (if target - (gexp ((with-target (ungexp target) - (lambda () - (compile-file entry - #:output-file output - #:opts - %auto-compilation-options))))) - (gexp ((compile-file entry - #:output-file output - #:opts %auto-compilation-options))))) + (with-target (ungexp (or target (gexp %host-type))) + (lambda () + (compile-file entry + #:output-file output + #:opts + %auto-compilation-options))) (+ 1 processed)))) |