From 92f7be6c0d2d51df34372a3a8bfd1718c0f83dc0 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Wed, 16 Jul 2025 15:02:20 +0300
Subject: [PATCH] Fixes to Gambit

---
 libs/data.sld | 102 ++++++++++++++------------------------------------
 1 file changed, 29 insertions(+), 73 deletions(-)

diff --git a/libs/data.sld b/libs/data.sld
index f76b153..ab781cd 100644
--- a/libs/data.sld
+++ b/libs/data.sld
@@ -137,80 +137,36 @@
         (gambit
           (type . compiler)
           (library-command . ,(lambda (library-file prepend-directories append-directories r6rs?)
-                                (let ((out (string-append (string-cut-from-end library-file 4) ".o"))
-                                      (static-out (string-append (string-cut-from-end library-file 4) ".a")))
-                                  (apply string-append
-                                         `("gsc -obj"
-                                           " "
-                                           ,(util-getenv "COMPILE_R7RS_GAMBIT")
-                                           " "
-                                           ,@(map (lambda (item)
-                                                    (string-append item ""))
-                                                  (append prepend-directories append-directories))
-                                           " "
-                                           ,(string-cut-from-end library-file 4))))))
+                                (apply string-append `("gsc -obj "
+                                                       ,(search-library-file (append append-directories
+                                                                                     prepend-directories)
+                                                                             library-file)))))
           (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
-                        (apply string-append `("gsc"
-                                               " "
-                                               ,(util-getenv "COMPILE_R7RS_GAMBIT")
-                                               " "
-                                               "-:search="
-                                               ,@(map (lambda (item)
-                                                        (string-append item ""))
-                                                      (append prepend-directories append-directories))
-                                               " "
-                                               "-o"
-                                               " "
-                                               ,output-file
-                                               " "
-                                               "-exe -nopreload"
-                                               " "
-                                               ,input-file))
-                        #;(apply string-append
-                        `("echo '#!/usr/bin/env -S gsi-script -f -:search="
-                          ,@(map (lambda (item)
-                                   (string-append item "/:"))
-                                 (append prepend-directories append-directories))
-                          "'"
-                          " "
-                          ">"
-                          " "
-                          ,(string-append (string-cut-from-end input-file 4) ".tmp")
-                          " "
-                          "&&"
-                          " "
-                          "cat"
-                          " "
-                          ,input-file
-                          " "
-                          ">>"
-                          " "
-                          ,(string-append (string-cut-from-end input-file 4) ".tmp")
-                          " "
-                          "&&"
-                          " "
-                          "gsc"
-                          " "
-                          ,(util-getenv "COMPILE_R7RS_GAMBIT")
-                          " "
-                          "-:search="
-                          ,@(map (lambda (item)
-                                   (string-append item "/"))
-                                 (append prepend-directories append-directories))
-                          " "
-                          "-o"
-                          " "
-                          ,output-file
-                          " "
-                          "-exe -nopreload"
-                          " "
-                          ,@(map (lambda (item) (string-append item "/ ")) prepend-directories)
-                          " "
-                          ,@(map (lambda (item) (string-append item "/ ")) append-directories)
-                          " "
-                          ,(string-append (string-cut-from-end input-file 4) ".tmp")
-                          ;,input-file
-                          )))))
+                        (let ((real
+                                (string-append (string-cut-from-end input-file 4)
+                                               "-real")))
+                          (apply
+                            string-append
+                            `("gsc -o " ,real
+                              " -exe -nopreload "
+                              ,@(map (lambda (item)
+                                       (string-append item "/ "))
+                                     (append prepend-directories
+                                             append-directories))
+                              ,input-file
+                              " && "
+                              "printf '#!/bin/sh\\n./" ,real
+                              " -:r7rs,search="
+                              ,@(map (lambda (item)
+                                       (string-append item "/ "))
+                                     (append prepend-directories
+                                             append-directories))
+                              ""
+                              "\\n"
+                              "'"
+                              " > " ,output-file
+                              " && "
+                              "chmod +x " ,output-file))))))
       (gauche
         (type . interpreter)
         (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)