diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | build-aux/cuirass/guix-modular.scm | 6 | ||||
| -rw-r--r-- | build-aux/hydra/guix-modular.scm | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index e630797b46..517322b7ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -469,6 +469,7 @@ EXTRA_DIST = \ build-aux/hydra/guix.scm \ build-aux/hydra/guix-modular.scm \ build-aux/cuirass/gnu-system.scm \ + build-aux/cuirass/guix-modular.scm \ build-aux/cuirass/hydra-to-cuirass.scm \ build-aux/check-available-binaries.scm \ build-aux/check-final-inputs-self-contained.scm \ diff --git a/build-aux/cuirass/guix-modular.scm b/build-aux/cuirass/guix-modular.scm new file mode 100644 index 0000000000..cbbdbf1133 --- /dev/null +++ b/build-aux/cuirass/guix-modular.scm @@ -0,0 +1,6 @@ +;;; +;;; This file defines Cuirass build jobs to build Guix itself. +;;; + +(include "../hydra/guix-modular.scm") +(include "hydra-to-cuirass.scm") diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm index bdbb2fa8d5..b6ba7040ba 100644 --- a/build-aux/hydra/guix-modular.scm +++ b/build-aux/hydra/guix-modular.scm @@ -86,15 +86,16 @@ for SYSTEM. Use VERSION as the version identifier." (list (%current-system))))) (define guix-checkout - (assq-ref arguments 'guix)) + (or (assq-ref arguments 'guix) ;Hydra on hydra + (assq-ref arguments 'guix-modular))) ;Cuirass on berlin (define version (or (assq-ref guix-checkout 'revision) "0.unknown")) (let ((file (assq-ref guix-checkout 'file-name))) - (format (current-error-port) "using checkout ~s (~s)~%" - guix-checkout file) + (format (current-error-port) "using checkout ~s (~s; arguments: ~s)~%" + guix-checkout file arguments) (map (lambda (system) (let ((name (string->symbol |