~ chicken-core (chicken-5) f6698267c2503edb407fc2508a0be0710dfc9345

commit f6698267c2503edb407fc2508a0be0710dfc9345
Author:     Kooda <kooda@upyum.com>
AuthorDate: Fri Mar 29 14:35:40 2019 +0100
Commit:     Peter Bex <peter@more-magic.net>
CommitDate: Sun Mar 31 11:54:11 2019 +0200

    Fix some bugs with the egg file c-object declaration
    
    Signed-off-by: Peter Bex <peter@more-magic.net>

diff --git a/egg-compile.scm b/egg-compile.scm
index ee7ed86e..bffcf7fa 100644
--- a/egg-compile.scm
+++ b/egg-compile.scm
@@ -618,7 +618,7 @@
            " " src " -o " out2)
     (when (pair? link-objects)
       (let ((lobjs (filelist srcdir
-                             (map (cut conc <> (object-extension platform))
+                             (map (cut conc <> ".static" (object-extension platform))
                                link-objects)
                              platform)))
         (print (qs* default-builder platform #t) " " out3 " : "
@@ -772,12 +772,13 @@
          (opts (if (null? options)
                    default-dynamic-compilation-options
                    options))
-         (sname (or source name))
+         (sname (prefix srcdir name))
+         (ssname (and source (prefix srcdir source)))
          (out (qs* (target-file (conc sname
                                       (object-extension platform))
                                 mode)
                    platform))
-         (src (qs* (conc sname ".c") platform)))
+         (src (qs* (or ssname (conc sname ".c")) platform)))
     (when custom
       (prepare-custom-command cmd platform))
     (print "\n" (slashify default-builder platform) " "