Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ ENV CFLAGS="-fPIC -pipe ${release:+-O2}"
ARG gc_version
ARG libatomic_ops_version
COPY files/feature-thread-stackbottom-upstream.patch /tmp/
RUN git clone https://github.com/ivmai/bdwgc \
RUN git clone --branch ${gc_version} --depth 1 https://github.com/ivmai/bdwgc \
&& cd bdwgc \
&& git checkout ${gc_version} \
&& git clone https://github.com/ivmai/libatomic_ops \
&& (cd libatomic_ops && git checkout ${libatomic_ops_version}) \
&& git clone --branch ${libatomic_ops_version} --depth 1 https://github.com/ivmai/libatomic_ops \
&& cd libatomic_ops \
\
&& patch -p1 < /tmp/feature-thread-stackbottom-upstream.patch \
\
Expand Down Expand Up @@ -54,11 +53,10 @@ ENV CFLAGS="-fPIC -pipe ${release:+-O2}"
# Build libgc (again, this time for musl)
ARG gc_version
ARG libatomic_ops_version
RUN git clone https://github.com/ivmai/bdwgc \
RUN git clone --branch ${gc_version} --depth 1 https://github.com/ivmai/bdwgc \
&& cd bdwgc \
&& git checkout ${gc_version} \
&& git clone https://github.com/ivmai/libatomic_ops \
&& (cd libatomic_ops && git checkout ${libatomic_ops_version}) \
&& git clone --branch ${libatomic_ops_version} --depth 1 https://github.com/ivmai/libatomic_ops \
&& cd libatomic_ops \
\
&& ./autogen.sh \
&& ./configure --disable-debug --disable-shared --enable-large-config \
Expand Down Expand Up @@ -89,9 +87,8 @@ RUN git clone https://github.com/crystal-lang/crystal \
# Build shards
ARG shards_version
ARG musl_target
RUN git clone https://github.com/crystal-lang/shards \
RUN git clone --branch ${shards_version} --depth 1 https://github.com/crystal-lang/shards \
&& cd shards \
&& git checkout ${shards_version} \
\
# Hack to make shards not segfault
&& echo 'require "llvm/lib_llvm"; require "llvm/enums"; require "./src/shards"' > hack.cr \
Expand Down