Cyclone fixes
This commit is contained in:
parent
d71e116ef9
commit
041e152237
2
Makefile
2
Makefile
|
@ -2,7 +2,7 @@ PREFIX=/usr/local
|
||||||
SCHEME=chibi
|
SCHEME=chibi
|
||||||
R6RSTMP=tmp/${SCHEME}-r6rs
|
R6RSTMP=tmp/${SCHEME}-r6rs
|
||||||
R7RSTMP=tmp/${SCHEME}-r7rs
|
R7RSTMP=tmp/${SCHEME}-r7rs
|
||||||
DOCKERIMG=${SCHEME}
|
DOCKERIMG=${SCHEME}:head
|
||||||
ifeq "${SCHEME}" "chicken"
|
ifeq "${SCHEME}" "chicken"
|
||||||
DOCKERIMG="chicken:5"
|
DOCKERIMG="chicken:5"
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -68,9 +68,7 @@
|
||||||
(string-append "-I " item " "))
|
(string-append "-I " item " "))
|
||||||
(append append-directories
|
(append append-directories
|
||||||
prepend-directories))
|
prepend-directories))
|
||||||
" "
|
"-unit "
|
||||||
"-unit"
|
|
||||||
" "
|
|
||||||
,unit
|
,unit
|
||||||
" "
|
" "
|
||||||
"&&"
|
"&&"
|
||||||
|
@ -92,7 +90,6 @@
|
||||||
,@(map (lambda (item)
|
,@(map (lambda (item)
|
||||||
(string-append "-I " item " "))
|
(string-append "-I " item " "))
|
||||||
(append append-directories prepend-directories))
|
(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")
|
||||||
|
@ -119,17 +116,18 @@
|
||||||
,library-file))))
|
,library-file))))
|
||||||
(command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
|
(command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
|
||||||
(apply string-append
|
(apply string-append
|
||||||
`("cyclone"
|
`("cyclone "
|
||||||
" "
|
|
||||||
,(util-getenv "COMPILE_R7RS_CYCLONE")
|
,(util-getenv "COMPILE_R7RS_CYCLONE")
|
||||||
" "
|
" "
|
||||||
"-o"
|
|
||||||
" "
|
|
||||||
,output-file
|
|
||||||
" "
|
|
||||||
,@(map (lambda (item) (string-append "-I " item " ")) prepend-directories)
|
,@(map (lambda (item) (string-append "-I " item " ")) prepend-directories)
|
||||||
,@(map (lambda (item) (string-append "-A " item " ")) append-directories)
|
,@(map (lambda (item) (string-append "-A " item " ")) append-directories)
|
||||||
,input-file)))))
|
,input-file
|
||||||
|
" && "
|
||||||
|
"mv "
|
||||||
|
,(string-cut-from-end input-file 4)
|
||||||
|
" "
|
||||||
|
,output-file
|
||||||
|
)))))
|
||||||
(foment
|
(foment
|
||||||
(type . interpreter)
|
(type . interpreter)
|
||||||
(command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
|
(command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
|
||||||
|
|
Loading…
Reference in New Issue