Skip to content

Commit 4a9fab7

Browse files
committed
remove llvm plugin usage
1 parent 142ec6f commit 4a9fab7

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ ENV RUST_CONFIGURE_ARGS \
3030
--enable-profiler \
3131
--enable-compiler-docs \
3232
--set llvm.libzstd=true
33-
--set llvm.plugins=true \
3433
--set llvm.enzyme=true \
3534
ENV SCRIPT python3 ../x.py --stage 2 test

src/ci/github-actions/jobs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ auto:
369369
- name: dist-x86_64-apple
370370
env:
371371
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
372-
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set llvm.plugins=true --set llvm.enzyme=true --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
372+
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set llvm.enzyme=true --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
373373
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
374374
# Ensure that host tooling is built to support our minimum support macOS version.
375375
MACOSX_DEPLOYMENT_TARGET: 10.12
@@ -387,7 +387,7 @@ auto:
387387
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim,aarch64-apple-ios-macabi,x86_64-apple-ios-macabi
388388
# Mac Catalyst cannot currently compile the sanitizer:
389389
# https://github.com/rust-lang/rust/issues/129069
390-
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.plugins=true --set llvm.enzyme=true --set target.aarch64-apple-ios-macabi.sanitizers=false --set target.x86_64-apple-ios-macabi.sanitizers=false
390+
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.enzyme=true --set target.aarch64-apple-ios-macabi.sanitizers=false --set target.x86_64-apple-ios-macabi.sanitizers=false
391391
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
392392
# Ensure that host tooling is built to support our minimum support macOS version.
393393
# FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
@@ -419,7 +419,6 @@ auto:
419419
--enable-profiler
420420
--set rust.jemalloc
421421
--set llvm.ninja=false
422-
--set llvm.plugins=true
423422
--set llvm.enzyme=true
424423
--set rust.lto=thin
425424
--set rust.codegen-units=1
@@ -603,7 +602,6 @@ auto:
603602
SCRIPT: python x.py dist bootstrap --include-default-paths
604603
RUST_CONFIGURE_ARGS: >-
605604
--build=x86_64-pc-windows-gnu
606-
--set llvm.plugins=true
607605
--set llvm.enzyme=true
608606
--enable-full-tools
609607
DIST_REQUIRE_ALL_TOOLS: 1

0 commit comments

Comments
 (0)