From c5c6729c88b6d00798f46d5c7397e854775d0923 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sat, 9 Mar 2024 18:06:59 +0100 Subject: [PATCH] Use full commit hash and remove `libgccjit.version` file --- src/ci/docker/host-x86_64/dist-x86_64-linux/build-gccjit.sh | 3 ++- src/ci/docker/host-x86_64/dist-x86_64-linux/libgccjit.version | 1 - src/ci/docker/host-x86_64/x86_64-gnu-llvm-16/Dockerfile | 1 - src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile | 1 - src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 src/ci/docker/host-x86_64/dist-x86_64-linux/libgccjit.version 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 ec4cb344e050d..324dd5fac161e 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 41bec6df5d95c..0000000000000 --- 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 4e12a6de781b8..6540a500d3a58 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 8dd0128895f6b..e10881caf27e7 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 2b66ac718db2f..a03577b45112b 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