nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gexp: 'compiled-modules' can cross-compile. 

* guix/gexp.scm (compiled-modules): Add #:target and honor it.
This commit is contained in:
Ludovic Courtès 2019-07-26 23:22:28 +02:00
parent 548e0af4da
commit 2cc5ec7f0d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
guix/gexp.scm
View File

@ -1345,6 +1345,7 @@ last one is created from the given <scheme-file> object."
(define* (compiled-modules modules (define* (compiled-modules modules
#:key (name "module-import-compiled") #:key (name "module-import-compiled")
(system (%current-system)) (system (%current-system))
target
(guile (%guile-for-build)) (guile (%guile-for-build))
(module-path %load-path) (module-path %load-path)
(extensions '()) (extensions '())
@ -1355,7 +1356,8 @@ last one is created from the given <scheme-file> object."
(pre-load-modules? #t)) (pre-load-modules? #t))
"Return a derivation that builds a tree containing the `.go' files "Return a derivation that builds a tree containing the `.go' files
corresponding to MODULES. All the MODULES are built in a context where corresponding to MODULES. All the MODULES are built in a context where
they can refer to each other." they can refer to each other. When TARGET is true, cross-compile MODULES for
TARGET, a GNU triplet."
(define total (length modules)) (define total (length modules))
(mlet %store-monad ((modules (imported-modules modules (mlet %store-monad ((modules (imported-modules modules
@ -1374,6 +1376,12 @@ they can refer to each other."
(srfi srfi-26) (srfi srfi-26)
(system base compile)) (system base compile))
;; TODO: Inline this on the next rebuild cycle.
(ungexp-splicing
(if target
(gexp ((use-modules (system base target))))
(gexp ())))
(define (regular? file) (define (regular? file)
(not (member file '("." "..")))) (not (member file '("." ".."))))
@ -1391,9 +1399,19 @@ they can refer to each other."
(gexp ())))) (gexp ()))))
(ungexp (* total (if pre-load-modules? 2 1))) (ungexp (* total (if pre-load-modules? 2 1)))
entry) entry)
(compile-file entry
#:output-file output (ungexp-splicing
#:opts %auto-compilation-options) (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)))))
(+ 1 processed)))) (+ 1 processed))))
(define (process-directory directory output processed) (define (process-directory directory output processed)