From 952fafb2a3c7a0978cc6a96268ad0632558b212d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 15 Sep 2020 14:36:24 +0200 Subject: build-system: asdf: Read all .asd files if no #:asd-files specified. * guix/build-system/asdf.scm (asdf-build): Remove the 'files' variable. * guix/build/asd-build-system.scm (find-asd-files): New variable. (build, check): Use it. --- guix/build-system/asdf.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'guix/build-system') diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 334a119948..28403a1960 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -291,7 +291,7 @@ set up using CL source package conventions." (imported-modules %asdf-build-system-modules) (modules %asdf-build-modules)) - ;; FIXME: The definitions of 'systems' and 'files' are pretty hacky. + ;; FIXME: The definition of 'systems' is pretty hacky. ;; Is there a more elegant way to do it? (define systems (if (null? (cadr asd-systems)) @@ -303,13 +303,6 @@ set up using CL source package conventions." (1+ (string-length lisp-type))))) ; drop the "-" prefix. asd-systems)) - (define files - (if (null? (cadr asd-files)) - `(quote ,(map (lambda (system) - (string-append system ".asd")) - (cadr systems))) - asd-files)) - (define builder `(begin (use-modules ,@modules) @@ -323,7 +316,7 @@ set up using CL source package conventions." (derivation->output-path source)) ((source) source) (source source)) - #:asd-files ,files + #:asd-files ,asd-files #:asd-systems ,systems #:test-asd-file ,test-asd-file #:system ,system -- cgit v1.2.3