Update linux LLVM to 8, and don't build crystal twice (#44)

Author: RX14

linux/Dockerfile

@@ -2,21 +2,10 @@ ARG alpine_image
 ARG debian_image
 FROM ${debian_image} AS debian
 
-RUN apt-get update \
- && apt-get install -y build-essential libevent-core-2.0-5 libevent-dev libevent-extra-2.0-5 libevent-openssl-2.0-5 libevent-pthreads-2.0-5 libpcre3-dev automake libtool pkg-config git software-properties-common apt-transport-https curl \
- && (pkg-config || true)
-
-RUN add-apt-repository "deb http://apt.llvm.org/jessie/ llvm-toolchain-jessie-4.0 main" \
- && curl -sSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+RUN echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list \
  && apt-get update \
- && apt-get install -y llvm-4.0-dev
-
-ARG previous_crystal_release
-ADD ${previous_crystal_release} /tmp/crystal.tar.gz
-ENV PATH=${PATH}:/tmp/crystal/bin
-RUN mkdir -p /tmp/crystal \
- && tar xz -f /tmp/crystal.tar.gz -C /tmp/crystal --strip-component=1 \
- && crystal --version
+ && apt-get install -y -t buster-backports build-essential libevent-dev libpcre3-dev automake libtool pkg-config git curl llvm-8 \
+ && (pkg-config || true)
 
 ARG release
 ENV CFLAGS="-fPIC -pipe ${release:+-O2}"
@@ -44,19 +33,18 @@ RUN git clone https://github.com/crystal-lang/crystal \
  && cd crystal \
  && git checkout ${crystal_sha1} \
  \
- && make deps \
- \
- && bin/crystal build src/compiler/crystal.cr -D without_openssl -D without_zlib \
-                      --cross-compile --target ${musl_target} -o /crystal-musl
+ && make deps
 
 FROM ${alpine_image}
 
+RUN sed -i 's|--list -- "$@"|--list "$@"|' /usr/bin/ldd
+
 # Install dependencies
 RUN apk add --no-cache \
       # Statically-compiled llvm
-      llvm4-dev llvm4-static \
-      # Static zlib, libyaml, pcre, and libevent
-      zlib-dev yaml-dev pcre-dev libevent-dev \
+      llvm8-dev llvm8-static \
+      # Static zlib, libyaml, libxml2, pcre, and libevent
+      zlib-dev yaml-dev libxml2-dev pcre-dev libevent-static \
       # Build tools
       git gcc g++ make automake libtool autoconf bash coreutils
 
@@ -77,23 +65,23 @@ RUN git clone https://github.com/ivmai/bdwgc \
  && make -j$(nproc) CFLAGS=-DNO_GETCONTEXT
 
 ENV LIBRARY_PATH=/bdwgc/.libs/
-ENV PATH=/usr/lib/llvm4/bin:$PATH
 RUN llvm-config --version
 
+ARG previous_crystal_release
+ADD ${previous_crystal_release} /tmp/crystal.tar.gz
+ENV PATH=${PATH}:/tmp/crystal/lib/crystal/bin/
+RUN mkdir -p /tmp/crystal \
+  && tar xz -f /tmp/crystal.tar.gz -C /tmp/crystal --strip-component=1 \
+  && crystal --version
+
 # Build crystal
-COPY --from=debian /crystal-musl.o /
 ARG crystal_version
 ARG crystal_sha1
 ARG gnu_target
 RUN git clone https://github.com/crystal-lang/crystal \
  && cd crystal \
  && git checkout ${crystal_sha1} \
  \
- && make deps \
- && mkdir -p .build/crystal-musl \
- && cc '/crystal-musl.o' -o '.build/crystal-musl/crystal' -rdynamic src/llvm/ext/llvm_ext.o `llvm-config --libs --system-libs --ldflags` -lstdc++ -lpcre -lm -lgc -lpthread src/ext/libcrystal.a -levent -lrt \
- && export PATH=.build/crystal-musl/:$PATH \
- \
  && make crystal stats=true static=true ${release:+release=true} \
                  CRYSTAL_CONFIG_TARGET=${gnu_target} \
  && ([ "$(ldd .build/crystal | wc -l)" -eq "1" ] || { echo './build/crystal is not statically linked'; ldd .build/crystal; exit 1; })

linux/Makefile

@@ -47,15 +47,15 @@ BUILD_ARGS_COMMON = $(DOCKER_BUILD_ARGS) \
 
 BUILD_ARGS64 = $(BUILD_ARGS_COMMON) \
                --build-arg previous_crystal_release=$(PREVIOUS_CRYSTAL_RELEASE_LINUX64_TARGZ)	\
-               --build-arg debian_image=debian:8 \
-               --build-arg alpine_image=alpine:3.8 \
+               --build-arg debian_image=debian:10 \
+               --build-arg alpine_image=alpine:3.10 \
                --build-arg musl_target=x86_64-linux-musl \
                --build-arg gnu_target=x86_64-unknown-linux-gnu
 
 BUILD_ARGS32 = $(BUILD_ARGS_COMMON) \
                --build-arg previous_crystal_release=$(PREVIOUS_CRYSTAL_RELEASE_LINUX32_TARGZ) \
-               --build-arg debian_image=i386/debian:8 \
-               --build-arg alpine_image=i386/alpine:3.8 \
+               --build-arg debian_image=i386/debian:10 \
+               --build-arg alpine_image=i386/alpine:3.10 \
                --build-arg musl_target=i686-linux-musl \
                --build-arg gnu_target=i686-unknown-linux-gnu