File tree 2 files changed +11
-7
lines changed
src/ci/docker/host-x86_64/x86_64-gnu-llvm-15
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/
35
35
COPY scripts/sccache.sh /scripts/
36
36
RUN sh /scripts/sccache.sh
37
37
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
-
43
38
# We are disabling CI LLVM since this builder is intentionally using a host
44
39
# LLVM, rather than the typical src/llvm-project LLVM.
45
40
ENV NO_DOWNLOAD_CI_LLVM 1
@@ -53,8 +48,7 @@ ENV RUST_CONFIGURE_ARGS \
53
48
--build=x86_64-unknown-linux-gnu \
54
49
--llvm-root=/usr/lib/llvm-15 \
55
50
--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
58
52
59
53
COPY host-x86_64/x86_64-gnu-llvm-15/script.sh /tmp/
60
54
Original file line number Diff line number Diff line change 2
2
3
3
set -ex
4
4
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
+
5
15
# Only run the stage 1 tests on merges, not on PR CI jobs.
6
16
if [[ -z " ${PR_CI_JOB} " ]]; then
7
17
# 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