Working towards snow-fort release

foreign/c.sld

@@ -201,7 +201,7 @@
           c-bytevector->bytevector
 
           ;;;; Utilities
-          libc
+          libc-name
 
           ;; TODO endianness
           native-endianness
@@ -314,7 +314,7 @@
     (gambit (include "c/primitives/gambit.scm"))
     (gauche (include "c/primitives/gauche/define-c-procedure.scm"))
     ;(gerbil (include "c/primitives/gerbil.scm"))
-    (guile (include "c/primitives/guile.scm"))
+    (guile (include "./c/primitives/guile.scm"))
     (kawa (include "c/primitives/kawa.scm"))
     (mit-scheme (include "c/primitives/mit-scheme.scm"))
     ;(larceny (include "c/primitives/larceny.scm"))

foreign/c/libc.scm

@@ -1,14 +1,7 @@
 (cond-expand
   (windows
-    (define-c-library libc
-                      '("stdlib.h" "stdio.h" "string.h")
-                      "ucrtbase"
-                      '()))
+    (define libc-name "ucrtbase"))
   (else
-    (define c-library "c")
-    (when (get-environment-variable "BE_HOST_CPU")
-      (set! c-library "root"))
-    (define-c-library libc
-                      '("stdlib.h" "stdio.h" "string.h")
-                      "c"
-                      '((additional-versions ("0" "6"))))))
+    (define libc-name
+      (cond ((get-environment-variable "BE_HOST_CPU") "root") ; Haiku
+            (else "c")))))

foreign/c/pointer.scm

@@ -1,3 +1,8 @@
+(define-c-library libc
+                  '("stdlib.h" "stdio.h" "string.h")
+                  libc-name
+                  '((additional-versions ("0" "6"))))
+
 (define-c-procedure c-calloc libc 'calloc 'pointer '(int int))
 (cond-expand
   (gambit