Skip to content

Commit 1419e70

Browse files
Build libgccjit in CI
1 parent 7151f60 commit 1419e70

File tree

5 files changed

+37
-5
lines changed

5 files changed

+37
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/sh
2+
3+
set -ex
4+
5+
# Setting up folders for GCC
6+
git clone https://github.com/antoyo/gcc gcc-src
7+
cd gcc-src
8+
git checkout $(head -1 /scripts/libgccjit.version)
9+
10+
mkdir ../gcc-build ../gcc-install
11+
cd ../gcc-build
12+
13+
# Building GCC.
14+
../gcc-src/configure \
15+
--enable-host-shared \
16+
--enable-languages=jit \
17+
--enable-checking=release \
18+
--disable-bootstrap \
19+
--disable-multilib \
20+
--prefix=$(pwd)/../gcc-install
21+
make
22+
make install
23+
24+
rm -rf ../gcc-src
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cf9554126

src/ci/docker/host-x86_64/x86_64-gnu-llvm-16/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2424
xz-utils \
2525
nodejs \
2626
mingw-w64 \
27-
libgccjit-12-dev \
2827
&& rm -rf /var/lib/apt/lists/*
2928

3029
# Note: libgccjit needs to match the default gcc version for the linker to find it.

src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2424
xz-utils \
2525
nodejs \
2626
mingw-w64 \
27-
libgccjit-13-dev \
2827
&& rm -rf /var/lib/apt/lists/*
2928

3029
# Note: libgccjit needs to match the default gcc version for the linker to find it.

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

+12-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
sudo \
1616
xz-utils \
1717
tidy \
18-
libgccjit-12-dev \
1918
\
2019
# Install dependencies for chromium browser
2120
gconf-service \
@@ -57,13 +56,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
5756
lsb-release \
5857
xdg-utils \
5958
wget \
59+
# libgccjit dependencies
60+
flex \
61+
libmpfr-dev \
62+
libgmp-dev \
63+
libmpc3 \
64+
libmpc-dev \
6065
&& rm -rf /var/lib/apt/lists/*
6166

6267
COPY scripts/sccache.sh /scripts/
6368
RUN sh /scripts/sccache.sh
6469

65-
# Make `libgccjit.so` accessible.
66-
RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/12/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so
6770
# Fix rustc_codegen_gcc lto issues.
6871
ENV GCC_EXEC_PREFIX="/usr/lib/gcc/"
6972

@@ -92,6 +95,12 @@ ENV RUST_CONFIGURE_ARGS \
9295

9396
ENV HOST_TARGET x86_64-unknown-linux-gnu
9497

98+
COPY host-x86_64/dist-x86_64-linux/libgccjit.version /scripts/
99+
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
100+
101+
RUN sh /scripts/build-gccjit.sh
102+
COPY gcc-install/lib/*.so /usr/lib/
103+
95104
ENV SCRIPT /tmp/checktools.sh ../x.py && \
96105
NODE_PATH=`npm root -g` python3 ../x.py test tests/rustdoc-gui --stage 2 \
97106
--test-args "'--no-sandbox --jobs 1'"

0 commit comments

Comments
 (0)