From ee3fce3a875925c197c4d736d2f806c3fc4ea0ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 2 May 2024 17:13:09 +0200
Subject: [PATCH] Use libgc from Alpine for building the compiler on Linux

---
 linux/Dockerfile | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/linux/Dockerfile b/linux/Dockerfile
index 7ae24e60..6f7c71cc 100644
--- a/linux/Dockerfile
+++ b/linux/Dockerfile
@@ -25,7 +25,7 @@ RUN apk add --no-cache \
       # Statically-compiled llvm
       llvm15-dev llvm15-static \
       # Static stdlib dependencies
-      zlib-static yaml-static libxml2-static pcre2-dev libevent-static \
+      gc-dev zlib-static yaml-static libxml2-static pcre2-dev libevent-static \
       # Static compiler dependencies
       libffi-dev \
       # Build tools
@@ -34,20 +34,12 @@ RUN apk add --no-cache \
 ARG release
 ENV CFLAGS="-fPIC -pipe ${release:+-O2}"
 
-# Build libgc (again, this time for musl)
-ARG gc_version
-RUN git clone https://github.com/ivmai/bdwgc \
- && cd bdwgc \
- && git checkout ${gc_version} \
- \
- && ./autogen.sh \
- && ./configure --disable-debug --disable-shared --enable-large-config \
- && make -j$(nproc) CFLAGS=-DNO_GETCONTEXT
-
 # This overrides default CRYSTAL_LIBRARY_PATH baked into the binary (starting with 1.2.0)
 # or configured via wrapper script (before 1.2.0) because we want to link against
-# the newly-built libraries, not the ones shipped with the bootstrap compiler.
-ENV CRYSTAL_LIBRARY_PATH=/bdwgc/.libs/
+# the regularly installed libraries, not the ones shipped with the bootstrap compiler.
+# This particularly affects libgc which was bundled upto Crystal 1.12
+ENV CRYSTAL_LIBRARY_PATH=""
+
 RUN llvm-config --version
 
 ARG previous_crystal_release