Skip to content

Commit 680cae1

Browse files
Greatly reduce GCC build logs
1 parent 6f3eb1c commit 680cae1

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

src/ci/docker/host-x86_64/dist-x86_64-linux/build-gccjit.sh

100644100755
+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
#!/bin/sh
1+
#!/usr/bin/env bash
22

33
set -ex
44

5+
source /tmp/shared.sh
6+
57
cd $1
68

79
# Setting up folders for GCC
@@ -20,9 +22,11 @@ cd ../gcc-build
2022
--enable-checking=release \
2123
--disable-bootstrap \
2224
--disable-multilib \
23-
--prefix=$(pwd)/../gcc-install
24-
make
25-
make install
25+
--prefix=$(pwd)/../gcc-install \
26+
--quiet
27+
28+
hide_output make
29+
hide_output make install
2630

2731
rm -rf ../gcc-src
2832
ln -s /scripts/gcc-install/lib/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ ENV RUST_CONFIGURE_ARGS \
5959

6060
COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
6161

62+
COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
6263
COPY 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

6667
ENV SCRIPT /tmp/script.sh

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ ENV RUST_CONFIGURE_ARGS \
5858

5959
COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/
6060

61+
COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
6162
COPY 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

6566
ENV SCRIPT /tmp/script.sh

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ ENV RUST_CONFIGURE_ARGS \
9595

9696
ENV HOST_TARGET x86_64-unknown-linux-gnu
9797

98+
COPY host-x86_64/dist-x86_64-linux/shared.sh /tmp/
9899
COPY 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

102103
ENV SCRIPT /tmp/checktools.sh ../x.py && \
103104
NODE_PATH=`npm root -g` python3 ../x.py test tests/rustdoc-gui --stage 2 \

0 commit comments

Comments
 (0)