File tree 4 files changed +40
-4
lines changed
bootstrap/src/core/build_steps
4 files changed +40
-4
lines changed Original file line number Diff line number Diff line change @@ -3394,7 +3394,6 @@ impl Step for CodegenGCC {
3394
3394
. arg ( "--out-dir" )
3395
3395
. arg ( builder. stage_out ( compiler, Mode :: ToolRustc ) . join ( "cg_gcc" ) )
3396
3396
. arg ( "--release" )
3397
- . arg ( "--no-default-features" )
3398
3397
. arg ( "--mini-tests" )
3399
3398
. arg ( "--std-tests" ) ;
3400
3399
cargo. args ( builder. config . test_args ( ) ) ;
Original file line number Diff line number Diff line change
1
+ #! /bin/sh
2
+
3
+ set -ex
4
+
5
+ cd $1
6
+
7
+ # Setting up folders for GCC
8
+ git clone https://github.com/antoyo/gcc gcc-src
9
+ cd gcc-src
10
+ git checkout $( head -1 /scripts/libgccjit.version)
11
+
12
+ mkdir ../gcc-build ../gcc-install
13
+ cd ../gcc-build
14
+
15
+ # Building GCC.
16
+ ../gcc-src/configure \
17
+ --enable-host-shared \
18
+ --enable-languages=jit \
19
+ --enable-checking=release \
20
+ --disable-bootstrap \
21
+ --disable-multilib \
22
+ --prefix=$( pwd) /../gcc-install
23
+ make
24
+ make install
25
+
26
+ rm -rf ../gcc-src
27
+ ln -s /scripts/gcc-install/lib/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so
28
+ ln -s /scripts/gcc-install/lib/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so.0
Original file line number Diff line number Diff line change
1
+ b6f163f52
Original file line number Diff line number Diff line change @@ -15,7 +15,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
15
15
sudo \
16
16
xz-utils \
17
17
tidy \
18
- libgccjit-12-dev \
19
18
\
20
19
# Install dependencies for chromium browser
21
20
gconf-service \
@@ -57,13 +56,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
57
56
lsb-release \
58
57
xdg-utils \
59
58
wget \
59
+ # libgccjit dependencies
60
+ flex \
61
+ libmpfr-dev \
62
+ libgmp-dev \
63
+ libmpc3 \
64
+ libmpc-dev \
60
65
&& rm -rf /var/lib/apt/lists/*
61
66
62
67
COPY scripts/sccache.sh /scripts/
63
68
RUN sh /scripts/sccache.sh
64
69
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
67
70
# Fix rustc_codegen_gcc lto issues.
68
71
ENV GCC_EXEC_PREFIX="/usr/lib/gcc/"
69
72
@@ -92,6 +95,11 @@ ENV RUST_CONFIGURE_ARGS \
92
95
93
96
ENV HOST_TARGET x86_64-unknown-linux-gnu
94
97
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 /scripts
102
+
95
103
ENV SCRIPT /tmp/checktools.sh ../x.py && \
96
104
NODE_PATH=`npm root -g` python3 ../x.py test tests/rustdoc-gui --stage 2 \
97
105
--test-args "'--no-sandbox --jobs 1'"
You can’t perform that action at this time.
0 commit comments