Bring things to new compile-r7rs
This commit is contained in:
parent
3ef686652f
commit
50f5290070
|
|
@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
|
RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
|
||||||
RUN cd chibi-scheme && make -j 32
|
RUN cd chibi-scheme && make -j 32
|
||||||
RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
|
RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
|
||||||
RUN cd compile-r7rs --branch=retropikzel-dependency-fixes && make
|
RUN cd compile-r7rs && make
|
||||||
|
|
||||||
ARG SCHEME=chibi
|
ARG SCHEME=chibi
|
||||||
ARG IMAGE=chibi:head
|
ARG IMAGE=chibi:head
|
||||||
|
|
|
||||||
|
|
@ -15,12 +15,12 @@ ARG SCHEME=chibi
|
||||||
ARG IMAGE=chibi:head
|
ARG IMAGE=chibi:head
|
||||||
FROM schemers/${IMAGE}
|
FROM schemers/${IMAGE}
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
git \
|
git \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
make \
|
make \
|
||||||
libffi-dev
|
libffi-dev
|
||||||
RUN mkdir ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
|
RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
|
||||||
COPY --from=build /chibi-scheme /chibi-scheme
|
COPY --from=build /chibi-scheme /chibi-scheme
|
||||||
RUN cd /chibi-scheme && make -j 8 install
|
RUN cd /chibi-scheme && make -j 8 install
|
||||||
COPY --from=build /compile-r7rs /compile-r7rs
|
COPY --from=build /compile-r7rs /compile-r7rs
|
||||||
|
|
|
||||||
|
|
@ -317,18 +317,15 @@
|
||||||
;(tr7 (include "c/primitives/tr7.scm"))
|
;(tr7 (include "c/primitives/tr7.scm"))
|
||||||
(ypsilon (export c-function c-callback)
|
(ypsilon (export c-function c-callback)
|
||||||
(include "c/primitives/ypsilon.scm")))
|
(include "c/primitives/ypsilon.scm")))
|
||||||
(cond-expand
|
(cond-expand
|
||||||
(chicken (include-relative "c/main.scm")
|
(chicken (include-relative "c/main.scm")
|
||||||
(include-relative "c/libc.scm")
|
(include-relative "c/libc.scm")
|
||||||
(include-relative "c/c-bytevectors.scm")
|
(include-relative "c/c-bytevectors.scm")
|
||||||
(include-relative "c/pointer.scm")
|
(include-relative "c/pointer.scm"))
|
||||||
;(include-relative "c/array.scm")
|
(else (include "c/main.scm")
|
||||||
;(include-relative "c/struct.scm")
|
(include "c/libc.scm")
|
||||||
)
|
(include "c/c-bytevectors.scm")
|
||||||
(else (include "c/main.scm")
|
(include "c/pointer.scm")))
|
||||||
(include "c/libc.scm")
|
;(include "c/array.scm")
|
||||||
(include "c/c-bytevectors.scm")
|
;(include "c/struct.scm")
|
||||||
(include "c/pointer.scm")
|
)
|
||||||
;(include "c/array.scm")
|
|
||||||
;(include "c/struct.scm")
|
|
||||||
)))
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue