File tree Expand file tree Collapse file tree 2 files changed +22
-4
lines changed
src/ci/docker/host-x86_64 Expand file tree Collapse file tree 2 files changed +22
-4
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2424 xz-utils \
2525 nodejs \
2626 mingw-w64 \
27- libgccjit-12-dev \
27+ # libgccjit dependencies
28+ flex \
29+ libmpfr-dev \
30+ libgmp-dev \
31+ libmpc3 \
32+ libmpc-dev \
2833 && rm -rf /var/lib/apt/lists/*
2934
3035# Note: libgccjit needs to match the default gcc version for the linker to find it.
@@ -54,4 +59,9 @@ ENV RUST_CONFIGURE_ARGS \
5459
5560COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
5661
62+ COPY host-x86_64/dist-x86_64-linux/libgccjit.version /scripts/
63+ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
64+
65+ RUN sh /scripts/build-gccjit.sh /scripts
66+
5767ENV SCRIPT /tmp/script.sh
Original file line number Diff line number Diff line change @@ -24,11 +24,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2424 xz-utils \
2525 nodejs \
2626 mingw-w64 \
27- libgccjit-13-dev \
27+ # libgccjit dependencies
28+ flex \
29+ libmpfr-dev \
30+ libgmp-dev \
31+ libmpc3 \
32+ libmpc-dev \
2833 && rm -rf /var/lib/apt/lists/*
2934
30- # Note: libgccjit needs to match the default gcc version for the linker to find it.
31-
3235# Install powershell (universal package) so we can test x.ps1 on Linux
3336RUN curl -sL "https://github.com/PowerShell/PowerShell/releases/download/v7.3.1/powershell_7.3.1-1.deb_amd64.deb" > powershell.deb && \
3437 dpkg -i powershell.deb && \
@@ -51,4 +54,9 @@ ENV RUST_CONFIGURE_ARGS \
5154
5255COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
5356
57+ COPY host-x86_64/dist-x86_64-linux/libgccjit.version /scripts/
58+ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
59+
60+ RUN sh /scripts/build-gccjit.sh /scripts
61+
5462ENV SCRIPT /tmp/script.sh
You can’t perform that action at this time.
0 commit comments