diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2023-10-28 17:22:24 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2023-11-02 21:03:27 +0100 |
| commit | 05a84760f65ed82acb953ca71ea4c053bed0df49 (patch) | |
| tree | 4f0d44e48cf07c4d55fed953439befe34ce44a50 /src | |
| parent | 3c58feaa085d9f082e0bff8ad72cfd9abb1ef75b (diff) | |
| download | rust-05a84760f65ed82acb953ca71ea4c053bed0df49.tar.gz rust-05a84760f65ed82acb953ca71ea4c053bed0df49.zip | |
Fix rustc_codegen_gcc lto issue
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile | 2 |
2 files changed, 4 insertions, 0 deletions
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/ |