diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-01-29 17:51:51 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-02-06 16:51:02 +0100 |
| commit | 32f33756d0fbbf28e848f087375f75c265d0a46c (patch) | |
| tree | fad30e72fe9ee12c339c316474fc7e44b27ab7ee /build-aux/manifest.scm | |
| parent | a211c8aaffcb583df3072aed88c8b6a982a8698e (diff) | |
| download | guile-32f33756d0fbbf28e848f087375f75c265d0a46c.tar.gz | |
maint: Add variants of the default package for Guix.
* build-aux/guix/guile-package.scm (package-with-configure-flags): New
procedure.
(guile-without-threads, guile-without-networking)
(guile-debug, guile-strict-typing): New variables.
* build-aux/manifest.scm: Use (guile-package) module instead of 'load'.
(native-builds): Add the variants above + "guile-clang".
Diffstat (limited to 'build-aux/manifest.scm')
| -rw-r--r-- | build-aux/manifest.scm | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/build-aux/manifest.scm b/build-aux/manifest.scm index 5699f80f4..0a25b2925 100644 --- a/build-aux/manifest.scm +++ b/build-aux/manifest.scm @@ -19,10 +19,8 @@ ;; integration service running at <https://ci.guix.gnu.org>. (use-modules (guix) - (guix profiles)) - -(define guile - (load "../guix.scm")) + (guix profiles) + (guile-package)) (define* (package->manifest-entry* package system #:key target) @@ -40,11 +38,25 @@ TARGET." (define native-builds (manifest - (map (lambda (system) - (package->manifest-entry* guile system)) - '("x86_64-linux" "i686-linux" - "aarch64-linux" "armhf-linux" - "powerpc64le-linux")))) + (append (map (lambda (system) + (package->manifest-entry* guile system)) + + '("x86_64-linux" "i686-linux" + "aarch64-linux" "armhf-linux" + "powerpc64le-linux")) + (map (lambda (guile) + (package->manifest-entry* guile "x86_64-linux")) + (cons (package + (inherit (package-with-c-toolchain + guile + `(("clang-toolchain" + ,(specification->package + "clang-toolchain"))))) + (name "guile-clang")) + (list guile-without-threads + guile-without-networking + guile-debug + guile-strict-typing)))))) (define cross-builds (manifest |