Skip to content

Commit 67b5990

Browse files
committed
Revert "Fix x test lint-docs when download-rustc is enabled"
This was not the correct fix. The problem was two-fold: - `download-rustc` didn't respect `llvm.assertions` - `rust-dev` was missing a bump to `download-ci-llvm-stamp` The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`.
1 parent 30e34f3 commit 67b5990

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

src/tools/lint-docs/src/groups.rs

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ impl<'a> LintExtractor<'a> {
3939
fn collect_groups(&self) -> Result<LintGroups, Box<dyn Error>> {
4040
let mut result = BTreeMap::new();
4141
let mut cmd = Command::new(self.rustc_path);
42-
cmd.env_remove("LD_LIBRARY_PATH");
4342
cmd.arg("-Whelp");
4443
let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?;
4544
if !output.status.success() {

src/tools/lint-docs/src/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,6 @@ impl<'a> LintExtractor<'a> {
403403
fs::write(&tempfile, source)
404404
.map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?;
405405
let mut cmd = Command::new(self.rustc_path);
406-
// NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself.
407-
// Unfortunately, lint-docs is a bootstrap tool while rustc is built from source,
408-
// and sometimes the paths conflict. In particular, when using `download-rustc`,
409-
// the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`.
410-
// Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler.
411-
cmd.env_remove("LD_LIBRARY_PATH");
412406
if options.contains(&"edition2015") {
413407
cmd.arg("--edition=2015");
414408
} else {

0 commit comments

Comments
 (0)