Skip to content

Commit

Permalink
Rollup merge of rust-lang#122496 - GuillaumeGomez:reduce-gcc-build-lo…
Browse files Browse the repository at this point in the history
…gs, 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`
  • Loading branch information
GuillaumeGomez committed Mar 15, 2024
2 parents 5c0012b + c4ece1f commit 5325c2b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
14 changes: 9 additions & 5 deletions src/ci/docker/host-x86_64/dist-x86_64-linux/build-gccjit.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/bin/sh
#!/usr/bin/env bash

set -ex

cd $1

source shared.sh

# Setting up folders for GCC
git clone https://github.com/antoyo/gcc gcc-src
cd gcc-src
Expand All @@ -14,15 +16,17 @@ mkdir ../gcc-build ../gcc-install
cd ../gcc-build

# Building GCC.
../gcc-src/configure \
hide_output \
../gcc-src/configure \
--enable-host-shared \
--enable-languages=jit \
--enable-checking=release \
--disable-bootstrap \
--disable-multilib \
--prefix=$(pwd)/../gcc-install
make
make install
--prefix=$(pwd)/../gcc-install \

hide_output make -j$(nproc)
hide_output make install

rm -rf ../gcc-src
ln -s /scripts/gcc-install/lib/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so
Expand Down
3 changes: 2 additions & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-llvm-16/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ ENV RUST_CONFIGURE_ARGS \

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

COPY host-x86_64/dist-x86_64-linux/shared.sh /scripts/
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/

RUN sh /scripts/build-gccjit.sh /scripts
RUN /scripts/build-gccjit.sh /scripts

ENV SCRIPT /tmp/script.sh
3 changes: 2 additions & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ ENV RUST_CONFIGURE_ARGS \

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

COPY host-x86_64/dist-x86_64-linux/shared.sh /scripts/
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/

RUN sh /scripts/build-gccjit.sh /scripts
RUN /scripts/build-gccjit.sh /scripts

ENV SCRIPT /tmp/script.sh
3 changes: 2 additions & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,10 @@ ENV RUST_CONFIGURE_ARGS \

ENV HOST_TARGET x86_64-unknown-linux-gnu

COPY host-x86_64/dist-x86_64-linux/shared.sh /scripts/
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/

RUN sh /scripts/build-gccjit.sh /scripts
RUN /scripts/build-gccjit.sh /scripts

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

0 comments on commit 5325c2b

Please sign in to comment.