Minor fixes

This commit is contained in:
retropikzel 2025-06-03 18:21:01 +03:00
parent 4cdd8c5dc0
commit 7f995f5035
2 changed files with 17 additions and 10 deletions

View File

@ -171,13 +171,14 @@
(define scheme-type (cdr (assoc 'type (cdr (assoc scheme data))))) (define scheme-type (cdr (assoc 'type (cdr (assoc scheme data)))))
(define scheme-command (define scheme-command
(apply (cdr (assoc 'command (cdr (assoc scheme data)))) (string-append (apply (cdr (assoc 'command (cdr (assoc scheme data))))
(list (if input-file input-file "") (list (if input-file input-file "")
(if output-file output-file "") (if output-file output-file "")
prepend-directories prepend-directories
append-directories append-directories
library-files library-files
r6rs?))) r6rs?))
(string #\newline)))
(define scheme-library-command (define scheme-library-command
(lambda (library-file) (lambda (library-file)

View File

@ -58,6 +58,10 @@
".a"))) ".a")))
(apply string-append `("csc -R r7rs -X r7rs -static -c -J" (apply string-append `("csc -R r7rs -X r7rs -static -c -J"
" " " "
,@(map (lambda (item)
(string-append "-I " item " "))
(append append-directories prepend-directories))
" "
"-unit" "-unit"
" " " "
,unit ,unit
@ -68,9 +72,7 @@
" " " "
,(util-getenv "COMPILE_R7RS_CHICKEN") ,(util-getenv "COMPILE_R7RS_CHICKEN")
" " " "
,(search-library-file (append prepend-directories ,(search-library-file (append prepend-directories append-directories) library-file)
append-directories)
library-file)
" " " "
"&&" "&&"
" " " "
@ -85,6 +87,10 @@
" " " "
,(util-getenv "COMPILE_R7RS_CHICKEN") ,(util-getenv "COMPILE_R7RS_CHICKEN")
" " " "
,@(map (lambda (item)
(string-append "-I " item " "))
(append append-directories prepend-directories))
" "
,@(map (lambda (library-file) ,@(map (lambda (library-file)
(string-append "-uses " (string-append "-uses "
(if (string-starts-with? library-file "srfi") (if (string-starts-with? library-file "srfi")