From 6a661b30fd82a0cdff27fa828bf4f582386e3709 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 10 Oct 2025 15:24:34 +0300 Subject: [PATCH] Small Kawa and Sagittarius fixes --- libs/data.sld | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/data.sld b/libs/data.sld index e9b0635..c5c52a2 100644 --- a/libs/data.sld +++ b/libs/data.sld @@ -318,13 +318,13 @@ 4) ".class ")) library-files)))) - `(;,(string-append "unzip -o -d . " kawa-jar-path) - ,(string-append + `(,(string-append "echo 'Main-Class: " main-class "\nClass-Path: . " classpath "' > MANIFEST.mf") ,(string-append "kawa " import-paths " --main -C " input-file) ,(string-append "jar cfm " output-jar " MANIFEST.mf " library-dirs " " main-class ".class") ,(string-append "printf '#!/bin/sh\nMYSELF=$(which \"$0\" 2>/dev/null)\n[ $? -gt 0 -a -f \"$0\" ] && MYSELF=\"./$0\"\njava=java\nif test -n \"$JAVA_HOME\"; then\n java=\"$JAVA_HOME/bin/java\"\nfi\nexec \"$java\" --add-exports=java.base/jdk.internal.foreign.abi=ALL-UNNAMED --add-exports=java.base/jdk.internal.foreign.layout=ALL-UNNAMED --add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED --enable-native-access=ALL-UNNAMED --enable-preview -jar $MYSELF \"$@\"\nexit 1\n' > " output-file) ,(string-append "cat " output-jar " >> " output-file) + ,(string-append "rm -rf " output-jar) ,(string-append "chmod +x " output-file)))))) (larceny (type . interpreter) @@ -463,7 +463,7 @@ (type . interpreter) (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?) (apply string-append - `("sash " + `("sash -d " ,(util-getenv "COMPILE_R7RS_SAGITTARIUS") ,(if r6rs? " -r6 " " -r7 ") ,@(map (lambda (item)