File tree 4 files changed +14
-8
lines changed
src/ci/docker/host-x86_64
4 files changed +14
-8
lines changed Original file line number Diff line number Diff line change 1
- #! /bin/sh
2
-
1
+ #! /usr/bin/env bash
3
2
set -ex
4
3
4
+ source /tmp/shared.sh
5
+
5
6
cd $1
6
7
7
8
# Setting up folders for GCC
@@ -20,9 +21,11 @@ cd ../gcc-build
20
21
--enable-checking=release \
21
22
--disable-bootstrap \
22
23
--disable-multilib \
23
- --prefix=$( pwd) /../gcc-install
24
- make
25
- make install
24
+ --prefix=$( pwd) /../gcc-install \
25
+ --quiet
26
+
27
+ hide_output make
28
+ hide_output make install
26
29
27
30
rm -rf ../gcc-src
28
31
ln -s /scripts/gcc-install/lib/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so
Original file line number Diff line number Diff line change @@ -59,8 +59,9 @@ ENV RUST_CONFIGURE_ARGS \
59
59
60
60
COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
61
61
62
+ COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
62
63
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
63
64
64
- RUN sh /scripts/build-gccjit.sh /scripts
65
+ RUN /scripts/build-gccjit.sh /scripts
65
66
66
67
ENV SCRIPT /tmp/script.sh
Original file line number Diff line number Diff line change @@ -58,8 +58,9 @@ ENV RUST_CONFIGURE_ARGS \
58
58
59
59
COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
60
60
61
+ COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
61
62
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
62
63
63
- RUN sh /scripts/build-gccjit.sh /scripts
64
+ RUN /scripts/build-gccjit.sh /scripts
64
65
65
66
ENV SCRIPT /tmp/script.sh
Original file line number Diff line number Diff line change @@ -95,9 +95,10 @@ ENV RUST_CONFIGURE_ARGS \
95
95
96
96
ENV HOST_TARGET x86_64-unknown-linux-gnu
97
97
98
+ COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
98
99
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
99
100
100
- RUN sh /scripts/build-gccjit.sh /scripts
101
+ RUN /scripts/build-gccjit.sh /scripts
101
102
102
103
ENV SCRIPT /tmp/checktools.sh ../x.py && \
103
104
NODE_PATH=`npm root -g` python3 ../x.py test tests/rustdoc-gui --stage 2 \
You can’t perform that action at this time.
0 commit comments