nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #122496 - GuillaumeGomez:reduce-gcc-build-logs, r=Mark-Simulacrum

Browse Source 
Greatly reduce GCC build logs

Fixes https://github.com/rust-lang/rust-log-analyzer/issues/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`
This commit is contained in:
Guillaume Gomez 2024-03-15 17:24:08 +01:00 committed by GitHub
commit 5325c2bdd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ci/docker/host-x86_64/dist-x86_64-linux/build-gccjit.sh Normal file → Executable file
View File

@ -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
@ -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

3
src/ci/docker/host-x86_64/x86_64-gnu-llvm-16/Dockerfile
View File

@ -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
src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile
View File

@ -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
src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile
View File

@ -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 \