Another follow-up patch on the recent change of quoting in chicken-install, 
which causes
chicken-do to always fire (and thus rebuilding any egg, regardless of status).


felix
From 942b63f2a08dad36a3d73a68a3bac43bf7469ab2 Mon Sep 17 00:00:00 2001
From: felix <[email protected]>
Date: Sun, 30 Oct 2022 14:38:38 +0100
Subject: [PATCH] handle another double-quoting case which forced recompilation
 of eggs

---
 egg-compile.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/egg-compile.scm b/egg-compile.scm
index 14c93be0..6c9b21c5 100644
--- a/egg-compile.scm
+++ b/egg-compile.scm
@@ -613,16 +613,16 @@
                            (list "-emit-inline-file" ifile)
                            '())))
          (out1 (conc sname ".static"))
-         (out2 (qs* (target-file (conc out1
-                                       (object-extension platform))
-                                 mode)
-                    platform))
+         (out2 (target-file (conc out1
+                                  (object-extension platform))
+                            mode))
          (out3 (if (null? link-objects)
                    out2
-                   (qs* (target-file (conc out1
-                                           (archive-extension platform))
-                                     mode)
-                        platform)))
+                   (target-file (conc out1
+                                      (archive-extension platform))
+                                mode)))
+         (out2q (qs* out2 platform))
+         (out3q (qs* out3 platform))
          (targets (append (list out3 lfile)
                           (maybe types-file tfile)
                           (maybe inline-file ifile)
@@ -647,16 +647,16 @@
            " -D compiling-extension -c -unit " name
            " -D compiling-static-extension"
            " -C -I" srcdir (arglist opts platform) 
-           " " src " -o " out2)
+           " " src " -o " out2q)
     (when (pair? link-objects)
       (let ((lobjs (filelist srcdir
                              (map (cut conc <> ".static" (object-extension 
platform))
                                link-objects)
                              platform)))
-        (print (qs* default-builder platform #t) " " out3 " : "
-               out2 " " lobjs " : "
+        (print (qs* default-builder platform #t) " " 
+               out3q " : " out2q " " lobjs " : "
                (qs* target-librarian platform) " "
-               target-librarian-options " " out3 " " out2 " "
+               target-librarian-options " " out3q " " out2q " "
                lobjs)))
     (print-end-command platform)))
 
@@ -684,7 +684,7 @@
                        (if inline-file
                            (list "-emit-inline-file" ifile)
                            '())))
-         (out (qs* (target-file (conc sname ".so") mode) platform))
+         (out (target-file (conc sname ".so") mode))
          (src (qs* (or source (conc name ".scm")) platform))
          (lobjs (map (lambda (lo)
                        (target-file (conc lo
-- 
2.28.0

Reply via email to