diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2024-03-09 18:06:59 +0100 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2024-03-10 01:01:53 +0100 |
| commit | c5c6729c88b6d00798f46d5c7397e854775d0923 (patch) | |
| tree | 5e125d727c21e270661c886219c6b540beff3020 /src/ci/docker | |
| parent | 1d058a0b061b9651be9031131180e1b9324be7f6 (diff) | |
| download | rust-c5c6729c88b6d00798f46d5c7397e854775d0923.tar.gz rust-c5c6729c88b6d00798f46d5c7397e854775d0923.zip | |
Use full commit hash and remove `libgccjit.version` file
Diffstat (limited to 'src/ci/docker')
5 files changed, 2 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gccjit.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gccjit.sh index ec4cb344e05..324dd5fac16 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gccjit.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gccjit.sh @@ -7,7 +7,8 @@ cd $1 # Setting up folders for GCC git clone https://github.com/antoyo/gcc gcc-src cd gcc-src -git checkout $(head -1 /scripts/libgccjit.version) +# This commit hash needs to be updated to use a more recent gcc fork version. +git checkout 78dc50f0e50e6cd1433149520bd512a4e0eaa1bc mkdir ../gcc-build ../gcc-install cd ../gcc-build diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/libgccjit.version b/src/ci/docker/host-x86_64/dist-x86_64-linux/libgccjit.version deleted file mode 100644 index 41bec6df5d9..00000000000 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/libgccjit.version +++ /dev/null @@ -1 +0,0 @@ -b6f163f52 diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-16/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-16/Dockerfile index 4e12a6de781..6540a500d3a 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-16/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-16/Dockerfile @@ -59,7 +59,6 @@ ENV RUST_CONFIGURE_ARGS \ COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/ -COPY host-x86_64/dist-x86_64-linux/libgccjit.version /scripts/ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/ RUN sh /scripts/build-gccjit.sh /scripts diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile index 8dd0128895f..e10881caf27 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile @@ -54,7 +54,6 @@ ENV RUST_CONFIGURE_ARGS \ COPY host-x86_64/x86_64-gnu-llvm-16/script.sh /tmp/ -COPY host-x86_64/dist-x86_64-linux/libgccjit.version /scripts/ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/ RUN sh /scripts/build-gccjit.sh /scripts diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile index 2b66ac718db..a03577b4511 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile @@ -95,7 +95,6 @@ ENV RUST_CONFIGURE_ARGS \ ENV HOST_TARGET x86_64-unknown-linux-gnu -COPY host-x86_64/dist-x86_64-linux/libgccjit.version /scripts/ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/ RUN sh /scripts/build-gccjit.sh /scripts |