From 05a84760f65ed82acb953ca71ea4c053bed0df49 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sat, 28 Oct 2023 17:22:24 +0200 Subject: [PATCH] Fix rustc_codegen_gcc lto issue --- src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/Dockerfile | 2 ++ src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/Dockerfile index 1ab91b465aa..5fbf89eec03 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/Dockerfile @@ -37,6 +37,8 @@ RUN sh /scripts/sccache.sh # Make `libgccjit.so` accessible. RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/12/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so +# Fix rustc_codegen_gcc lto issues. +ENV GCC_EXEC_PREFIX="/usr/lib/gcc/" # We are disabling CI LLVM since this builder is intentionally using a host # LLVM, rather than the typical src/llvm-project LLVM. 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 00f6a12e95c..183cc2b8d19 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 @@ -64,6 +64,8 @@ RUN sh /scripts/sccache.sh # Make `libgccjit.so` accessible. RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/12/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so +# Fix rustc_codegen_gcc lto issues. +ENV GCC_EXEC_PREFIX="/usr/lib/gcc/" COPY host-x86_64/x86_64-gnu-tools/checktools.sh /tmp/