File tree Expand file tree Collapse file tree 2 files changed +11
-7
lines changed
src/ci/docker/host-x86_64/x86_64-gnu-llvm-15 Expand file tree Collapse file tree 2 files changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -35,11 +35,6 @@ RUN curl -sL "https://github.com/PowerShell/PowerShell/releases/download/v7.3.1/
3535COPY scripts/sccache.sh /scripts/
3636RUN sh /scripts/sccache.sh
3737
38- # Make `libgccjit.so` accessible.
39- RUN ln -s /usr/lib/gcc/x86_64-linux-gnu/12/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so
40- # Fix rustc_codegen_gcc lto issues.
41- ENV GCC_EXEC_PREFIX="/usr/lib/gcc/"
42-
4338# We are disabling CI LLVM since this builder is intentionally using a host
4439# LLVM, rather than the typical src/llvm-project LLVM.
4540ENV NO_DOWNLOAD_CI_LLVM 1
@@ -53,8 +48,7 @@ ENV RUST_CONFIGURE_ARGS \
5348 --build=x86_64-unknown-linux-gnu \
5449 --llvm-root=/usr/lib/llvm-15 \
5550 --enable-llvm-link-shared \
56- --set rust.thin-lto-import-instr-limit=10 \
57- --enable-new-symbol-mangling
51+ --set rust.thin-lto-import-instr-limit=10
5852
5953COPY host-x86_64/x86_64-gnu-llvm-15/script.sh /tmp/
6054
Original file line number Diff line number Diff line change 22
33set -ex
44
5+ if [[ " ${ENABLE_GCC_CODEGEN} " == " 1" ]]; then
6+ # Fix rustc_codegen_gcc lto issues.
7+ export GCC_EXEC_PREFIX=" /usr/lib/gcc/"
8+ # Make `libgccjit.so` accessible to the linker.
9+ ln -s /usr/lib/gcc/x86_64-linux-gnu/12/libgccjit.so /usr/lib/x86_64-linux-gnu/libgccjit.so
10+ # cg_gcc doesn't support the legacy mangling so we need to enforce the new one
11+ # if we run cg_gcc tests.
12+ export RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --enable-new-symbol-mangling"
13+ fi
14+
515# Only run the stage 1 tests on merges, not on PR CI jobs.
616if [[ -z " ${PR_CI_JOB} " ]]; then
717 # When running gcc backend tests, we need to install `libgccjit` and to not run llvm codegen
You can’t perform that action at this time.
0 commit comments