diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-02-15 09:31:42 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-02-15 09:33:59 +0100 |
| commit | 7f6dd3be3dceb0fda15fd02c9165614b2626813e (patch) | |
| tree | 508ece49301b8c262b19ec8d1eff5fee45a70035 /guix | |
| parent | 7d580f1c2c2dd4077101b66bbe7b46348c5af636 (diff) | |
gexp: 'computed-file' always uses a native Guile.
Fixes a regression whereby, when cross-compiling, 'computed-file' would
use a cross-compiled Guile as its builder, which would fail to run.
Regression introduced in af57d1bf6c46f47d82dbc234dde1e16fa8634e9d (the
problem had always been there but was hidden before behind the (not guile)
condition.)
* guix/gexp.scm (computed-file-compiler): For 'guile', pass #:target #f.
* tests/gexp.scm ("lower-object, computed-file, #:target"): New test.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/gexp.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm index dfeadbd15d..d23683e2a6 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -598,7 +598,7 @@ This is the declarative counterpart of 'gexp->derivation'." (match file (($ <computed-file> name gexp guile options) (mlet %store-monad ((guile (lower-object (or guile (default-guile)) - system #:target target))) + system #:target #f))) (apply gexp->derivation name gexp #:guile-for-build guile #:system system #:target target options))))) |