~ chicken-core (chicken-5) 8b2d3e765cb9644ea6c6ee6c9d9db1dc6da6d0b8


commit 8b2d3e765cb9644ea6c6ee6c9d9db1dc6da6d0b8
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Tue Jun 20 21:51:56 2017 +1200
Commit:     Peter Bex <peter@more-magic.net>
CommitDate: Sun Jun 25 12:25:38 2017 +0200

    Fix running "make check" without installing
    
    This is the second half of 934eecc, re-applied. The symptom is the same
    as in that commit (the static linking tests failing), and the fix is
    also more or less the same (passing "-static -lchicken" and letting the
    linker sort out the path to libchicken.a).
    
    Fixes #1366.
    
    Signed-off-by: Peter Bex <peter@more-magic.net>

diff --git a/csc.scm b/csc.scm
index 5724b0cc..affa02e5 100644
--- a/csc.scm
+++ b/csc.scm
@@ -216,14 +216,10 @@
   (if host-mode host-libs default-libs))
 
 (define (default-library-files)
-  (list (string-append (if host-mode host-libdir default-libdir)
-                       (string-append "/" (default-library)))))
-
-(define (default-shared-library-files)
   (list (string-append "-l" (if host-mode INSTALL_LIB_NAME TARGET_LIB_NAME))))
 
 (define (library-files) (default-library-files))
-(define (shared-library-files) (default-shared-library-files))
+(define (shared-library-files) (default-library-files))
 
 (define translate-options '())
 
@@ -600,10 +596,10 @@ EOF
 		(when osx (set! compile-options (cons "-no-cpp-precomp" compile-options))) ]
 	       [(-objc) 
 		(set! objc-mode #t) ]
-	       [(-static) 
-		(set! translate-options
-                  (cons "-static" translate-options))
-		(set! static #t) ]
+	       [(-static)
+		(set! translate-options (cons "-static" translate-options))
+		(set! link-options (cons "-static" link-options))
+		(set! static #t)]
 	       [(-cflags)
 		(set! inquiry-only #t) 
 		(set! show-cflags #t) ]
Trap