From 3183946989aa30a79e7dcad7e4cd85b056b794e9 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Wed, 25 Jun 2025 08:29:50 +0300 Subject: [PATCH] Switch to new compile-r7rs --- dockerfiles/Dockerfile.test | 11 ++--------- foreign/c/libc.scm | 11 +++++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dockerfiles/Dockerfile.test b/dockerfiles/Dockerfile.test index 59521a8..cce20ce 100644 --- a/dockerfiles/Dockerfile.test +++ b/dockerfiles/Dockerfile.test @@ -1,9 +1,3 @@ -ARG COMPILE_R7RS=chibi -FROM schemers/sagittarius AS build -RUN apt-get update && apt-get install -y wget build-essential make cmake libgc-dev zlib1g-dev libffi-dev libssl-dev -RUN wget https://github.com/ktakashi/sagittarius-scheme/releases/download/v0.9.13/sagittarius-0.9.13.tar.gz && tar -xf sagittarius-0.9.13.tar.gz -RUN cd sagittarius-0.9.13 && ./dist.sh gen && cmake -DCMAKE_INSTALL_PREFIX=/usr/local-other && make && make install - FROM schemers/${COMPILE_R7RS} RUN apt-get update && apt-get install -y \ build-essential \ @@ -15,9 +9,8 @@ RUN apt-get update && apt-get install -y \ libuv1 \ build-essential \ libffi-dev \ - libmbedtls-dev -COPY --from=build /usr/local-other /usr/local-other -ENV PATH=${PATH}:/usr/local-other/bin + libmbedtls-dev \ + chicken-bin RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1 RUN cd compile-r7rs && make && make install diff --git a/foreign/c/libc.scm b/foreign/c/libc.scm index 0cc1b4f..661a5bf 100644 --- a/foreign/c/libc.scm +++ b/foreign/c/libc.scm @@ -1,10 +1,13 @@ (cond-expand - (windows (define-c-library libc '("stdio.h" "string.h") "ucrtbase" '())) + (windows (define-c-library libc + '("stdlib.h" "stdio.h" "string.h") + "ucrtbase" + '())) (else - ;(define c-library "c") - #;(when (get-environment-variable "BE_HOST_CPU") + (define c-library "c") + (when (get-environment-variable "BE_HOST_CPU") (set! c-library "root")) (define-c-library libc - '("stdio.h" "string.h") + '("stdlib.h" "stdio.h" "string.h") "c" '((additional-versions ("0" "6"))))))