File tree Expand file tree Collapse file tree 4 files changed +14
-8
lines changed
src/ci/docker/host-x86_64 Expand file tree Collapse file tree 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
32set -ex
43
4+ source /tmp/shared.sh
5+
56cd $1
67
78# Setting up folders for GCC
@@ -20,9 +21,11 @@ cd ../gcc-build
2021 --enable-checking=release \
2122 --disable-bootstrap \
2223 --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
2629
2730rm -rf ../gcc-src
2831ln -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 \
5959
6060COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
6161
62+ COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
6263COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
6364
64- RUN sh /scripts/build-gccjit.sh /scripts
65+ RUN /scripts/build-gccjit.sh /scripts
6566
6667ENV SCRIPT /tmp/script.sh
Original file line number Diff line number Diff line change @@ -58,8 +58,9 @@ ENV RUST_CONFIGURE_ARGS \
5858
5959COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
6060
61+ COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
6162COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
6263
63- RUN sh /scripts/build-gccjit.sh /scripts
64+ RUN /scripts/build-gccjit.sh /scripts
6465
6566ENV SCRIPT /tmp/script.sh
Original file line number Diff line number Diff line change @@ -95,9 +95,10 @@ ENV RUST_CONFIGURE_ARGS \
9595
9696ENV HOST_TARGET x86_64-unknown-linux-gnu
9797
98+ COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
9899COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
99100
100- RUN sh /scripts/build-gccjit.sh /scripts
101+ RUN /scripts/build-gccjit.sh /scripts
101102
102103ENV SCRIPT /tmp/checktools.sh ../x.py && \
103104 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