File tree Expand file tree Collapse file tree 6 files changed +8
-3
lines changed Expand file tree Collapse file tree 6 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -56,6 +56,7 @@ no_llvm_build
5656/src /tools /x /target
5757# Created by default with `src/ci/docker/run.sh`
5858/obj /
59+ /src /ci /docker /scripts /libgccjit.version
5960# Created by nix dev shell / .envrc
6061src /tools /nix-dev-shell /flake.lock
6162
Original file line number Diff line number Diff line change @@ -55,6 +55,7 @@ ENV RUST_CONFIGURE_ARGS \
5555 --set rust.thin-lto-import-instr-limit=10
5656
5757COPY scripts/shared.sh /scripts/
58+ COPY scripts/libgccjit.version /scripts/
5859COPY scripts/build-gccjit.sh /scripts/
5960
6061RUN /scripts/build-gccjit.sh /scripts
Original file line number Diff line number Diff line change @@ -55,6 +55,7 @@ ENV RUST_CONFIGURE_ARGS \
5555 --set rust.thin-lto-import-instr-limit=10
5656
5757COPY scripts/shared.sh /scripts/
58+ COPY scripts/libgccjit.version /scripts/
5859COPY scripts/build-gccjit.sh /scripts/
5960
6061RUN /scripts/build-gccjit.sh /scripts
Original file line number Diff line number Diff line change @@ -90,6 +90,7 @@ ENV HOST_TARGET x86_64-unknown-linux-gnu
9090# ENV FORCE_CI_RUSTC 1
9191
9292COPY scripts/shared.sh /scripts/
93+ COPY scripts/libgccjit.version /scripts/
9394COPY scripts/build-gccjit.sh /scripts/
9495
9596RUN /scripts/build-gccjit.sh /scripts
Original file line number Diff line number Diff line change @@ -325,6 +325,7 @@ touch $objdir/${SUMMARY_FILE}
325325
326326extra_env=" "
327327if [ " $ENABLE_GCC_CODEGEN " = " 1" ]; then
328+ cp /checkout/compiler/rustc_codegen_gcc/libgccjit.version /checkout/src/ci/docker/scripts/libgccjit.version
328329 extra_env=" $extra_env --env ENABLE_GCC_CODEGEN=1"
329330 # Fix rustc_codegen_gcc lto issues.
330331 extra_env=" $extra_env --env GCC_EXEC_PREFIX=/usr/lib/gcc/"
Original file line number Diff line number Diff line change 22
33GIT_REPO=" https://github.com/rust-lang/gcc"
44
5- # This commit hash needs to be updated to use a more recent gcc fork version.
6- GIT_COMMIT=" 45648c2edd4ecd862d9f08196d3d6c6ccba79f07"
7-
85set -ex
96
107cd $1
118
9+ # This is the forked git commit hash used by the GCC backend.
10+ GIT_COMMIT=" $( head -n 1 libgccjit.version) "
11+
1212source shared.sh
1313
1414# Setting up folders for GCC
You can’t perform that action at this time.
0 commit comments