From 041e152237c09d044dfd3b68af866818b2e46348 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 31 Jul 2025 14:53:10 +0300 Subject: [PATCH] Cyclone fixes --- Makefile | 2 +- libs/data.sld | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 500e799..ac4286a 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PREFIX=/usr/local SCHEME=chibi R6RSTMP=tmp/${SCHEME}-r6rs R7RSTMP=tmp/${SCHEME}-r7rs -DOCKERIMG=${SCHEME} +DOCKERIMG=${SCHEME}:head ifeq "${SCHEME}" "chicken" DOCKERIMG="chicken:5" endif diff --git a/libs/data.sld b/libs/data.sld index ec255a8..fbfec94 100644 --- a/libs/data.sld +++ b/libs/data.sld @@ -68,9 +68,7 @@ (string-append "-I " item " ")) (append append-directories prepend-directories)) - " " - "-unit" - " " + "-unit " ,unit " " "&&" @@ -92,7 +90,6 @@ ,@(map (lambda (item) (string-append "-I " item " ")) (append append-directories prepend-directories)) - " " ,@(map (lambda (library-file) (string-append "-uses " (if (string-starts-with? library-file "srfi") @@ -119,17 +116,18 @@ ,library-file)))) (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?) (apply string-append - `("cyclone" - " " + `("cyclone " ,(util-getenv "COMPILE_R7RS_CYCLONE") " " - "-o" - " " - ,output-file - " " ,@(map (lambda (item) (string-append "-I " item " ")) prepend-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 (type . interpreter) (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)