Skip to content

Commit ece41f3

Browse files
authored
Unrolled build for rust-lang#122496
Rollup merge of rust-lang#122496 - GuillaumeGomez:reduce-gcc-build-logs, r=Mark-Simulacrum Greatly reduce GCC build logs Fixes rust-lang/rust-log-analyzer#80. Based on [makefile documentation](https://www.gnu.org/software/make/manual/html_node/Options-Summary.html#index-_002d_002dquiet-1) and [configure documentation](https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/configure-Invocation.html). cc `@RalfJung` `@antoyo`
2 parents c5b5713 + c4ece1f commit ece41f3

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

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

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

33
set -ex
44

55
cd $1
66

7+
source shared.sh
8+
79
# Setting up folders for GCC
810
git clone https://github.com/antoyo/gcc gcc-src
911
cd gcc-src
@@ -14,15 +16,17 @@ mkdir ../gcc-build ../gcc-install
1416
cd ../gcc-build
1517

1618
# Building GCC.
17-
../gcc-src/configure \
19+
hide_output \
20+
../gcc-src/configure \
1821
--enable-host-shared \
1922
--enable-languages=jit \
2023
--enable-checking=release \
2124
--disable-bootstrap \
2225
--disable-multilib \
23-
--prefix=$(pwd)/../gcc-install
24-
make
25-
make install
26+
--prefix=$(pwd)/../gcc-install \
27+
28+
hide_output make -j$(nproc)
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 /scripts/
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 /scripts/
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 /scripts/
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)