pull: Compile guix/ files before gnu/ files.
* guix/scripts/pull.scm (unpack)[builder]: Build files under guix/ before files under gnu/.master
parent
ca6c4fa190
commit
52a79f1e73
|
@ -150,7 +150,16 @@ files."
|
||||||
%auto-compilation-options)))
|
%auto-compilation-options)))
|
||||||
|
|
||||||
(filter (cut string-suffix? ".scm" <>)
|
(filter (cut string-suffix? ".scm" <>)
|
||||||
(find-files out "\\.scm")))
|
|
||||||
|
;; Build guix/*.scm before gnu/*.scm to speed
|
||||||
|
;; things up.
|
||||||
|
(sort (find-files out "\\.scm")
|
||||||
|
(let ((guix (string-append out "/guix"))
|
||||||
|
(gnu (string-append out "/gnu")))
|
||||||
|
(lambda (a b)
|
||||||
|
(or (and (string-prefix? guix a)
|
||||||
|
(string-prefix? gnu b))
|
||||||
|
(string<? a b)))))))
|
||||||
|
|
||||||
;; Remove the "fake" (guix config).
|
;; Remove the "fake" (guix config).
|
||||||
(delete-file (string-append out "/guix/config.scm"))
|
(delete-file (string-append out "/guix/config.scm"))
|
||||||
|
|
Loading…
Reference in New Issue