Skip to content

Commit e36478a

Browse files
committed
explicitly disable rust.lld on the vanilla LLVM builders
It's not really needed because using an external LLVM disables LLD, but it will ensure that things are tested without lld explicitly.
1 parent 5ad7a10 commit e36478a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ ENV RUST_CONFIGURE_ARGS \
5454
--build=x86_64-unknown-linux-gnu \
5555
--llvm-root=/usr/lib/llvm-17 \
5656
--enable-llvm-link-shared \
57-
--set rust.thin-lto-import-instr-limit=10
57+
--set rust.thin-lto-import-instr-limit=10 \
58+
--set rust.lld=false
5859

5960
COPY host-x86_64/dist-x86_64-linux/shared.sh /scripts/
6061
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/

src/ci/docker/host-x86_64/x86_64-gnu-llvm-18/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ ENV RUST_CONFIGURE_ARGS \
5151
--build=x86_64-unknown-linux-gnu \
5252
--llvm-root=/usr/lib/llvm-18 \
5353
--enable-llvm-link-shared \
54-
--set rust.thin-lto-import-instr-limit=10
54+
--set rust.thin-lto-import-instr-limit=10 \
55+
--set rust.lld=false
5556

5657
COPY host-x86_64/dist-x86_64-linux/shared.sh /scripts/
5758
COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/

0 commit comments

Comments
 (0)