.

zilti/build-system/chicken.scm

@@ -63,32 +63,29 @@ EXTENSION is the file name extension, such as '.tar.gz'."
   (define private-keywords
     '(#:target #:chicken #:inputs #:native-inputs #:outputs))
 
+  ;; TODO: cross-compilation support
+  (and (not target)
        (bag
          (name name)
          (system system)
-    (target target)
+         (host-inputs `(,@(if source
-    (build-inputs `(,@(if source
                               `(("source" ,source))
                               '())
-                    ,@`(("chicken" ,chicken))
+                        ,@inputs
-                    ,@native-inputs
+
-                    ,@(if target '() inputs)
+                        ;; Keep the standard inputs of 'gnu-build-system', since
-                    ,@(if target
+                        ;; Chicken compiles Scheme by using C as an intermediate
-                          (standard-cross-packages target 'host)
+                        ;; language.
-                          '())
+                        ,@(standard-packages)))
-                    ,@standard-packages))
+         (build-inputs `(("chicken" ,chicken)
-    (host-inputs (if target inputs '()))
+                         ,@native-inputs))
-    (target-inputs (if target
-                       (standard-cross-packages target 'target)
-                       '()))
          (outputs outputs)
-    ;; TODO: Cross-build support
+         (build chicken-build)
-    (build (if target '() chicken-build))
          (arguments
           (substitute-keyword-arguments
               (strip-keyword-arguments private-keywords arguments)
             ((#:extra-directories extra-directories)
-        `(list (,@(append-map
+             `(list ,@(append-map
                        (lambda (name)
                          (match (assoc name inputs)
                            ((_ pkg)