-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- fix build by applying upstream revert, see: rust-lang/rust#113678 - roll back to original location for bash completion, from: rust-lang/rust#113579
- Loading branch information
Showing
3 changed files
with
86 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From 05bc71cfaf9eb35caab425126d4fa8dcb8c62072 Mon Sep 17 00:00:00 2001 | ||
| From: ekusiadadus <[email protected]> | ||
| Date: Wed, 12 Jul 2023 00:54:27 +0900 | ||
| Subject: [PATCH] Revert "fix: :bug: etc/bash_complettion -> src/etc/... to | ||
| avoid copy error" | ||
|
|
||
| This reverts commit 08ce68b6a6bad360e9c3611ad60cf6598401f878. | ||
| --- | ||
| src/bootstrap/dist.rs | 6 +----- | ||
| 1 file changed, 1 insertion(+), 5 deletions(-) | ||
|
|
||
| diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs | ||
| index 4522819f996e8..b34a4b2dc63ba 100644 | ||
| --- a/src/bootstrap/dist.rs | ||
| +++ b/src/bootstrap/dist.rs | ||
| @@ -1074,11 +1074,7 @@ impl Step for Cargo { | ||
|
|
||
| tarball.add_file(&cargo, "bin", 0o755); | ||
| tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644); | ||
| - tarball.add_renamed_file( | ||
| - etc.join("cargo.bashcomp.sh"), | ||
| - "src/etc/bash_completion.d", | ||
| - "cargo", | ||
| - ); | ||
| + tarball.add_renamed_file(etc.join("cargo.bashcomp.sh"), "etc/bash_completion.d", "cargo"); | ||
| tarball.add_dir(etc.join("man"), "share/man/man1"); | ||
| tarball.add_legal_and_readme_to("share/doc/cargo"); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| From 67b5990472e3cac643d8cf90f45fe42201ddec3c Mon Sep 17 00:00:00 2001 | ||
| From: jyn <[email protected]> | ||
| Date: Mon, 10 Jul 2023 15:59:30 -0500 | ||
| Subject: [PATCH] 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`. | ||
| --- | ||
| src/tools/lint-docs/src/groups.rs | 1 - | ||
| src/tools/lint-docs/src/lib.rs | 6 ------ | ||
| 2 files changed, 7 deletions(-) | ||
|
|
||
| diff --git a/src/tools/lint-docs/src/groups.rs b/src/tools/lint-docs/src/groups.rs | ||
| index b11fb287cf4dd..5be8ef7996bb2 100644 | ||
| --- a/src/tools/lint-docs/src/groups.rs | ||
| +++ b/src/tools/lint-docs/src/groups.rs | ||
| @@ -39,7 +39,6 @@ impl<'a> LintExtractor<'a> { | ||
| fn collect_groups(&self) -> Result<LintGroups, Box<dyn Error>> { | ||
| let mut result = BTreeMap::new(); | ||
| let mut cmd = Command::new(self.rustc_path); | ||
| - cmd.env_remove("LD_LIBRARY_PATH"); | ||
| cmd.arg("-Whelp"); | ||
| let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?; | ||
| if !output.status.success() { | ||
| diff --git a/src/tools/lint-docs/src/lib.rs b/src/tools/lint-docs/src/lib.rs | ||
| index fe29b9abda39a..b7c8b9ed2e318 100644 | ||
| --- a/src/tools/lint-docs/src/lib.rs | ||
| +++ b/src/tools/lint-docs/src/lib.rs | ||
| @@ -403,12 +403,6 @@ impl<'a> LintExtractor<'a> { | ||
| fs::write(&tempfile, source) | ||
| .map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?; | ||
| let mut cmd = Command::new(self.rustc_path); | ||
| - // NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself. | ||
| - // Unfortunately, lint-docs is a bootstrap tool while rustc is built from source, | ||
| - // and sometimes the paths conflict. In particular, when using `download-rustc`, | ||
| - // the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`. | ||
| - // Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler. | ||
| - cmd.env_remove("LD_LIBRARY_PATH"); | ||
| if options.contains(&"edition2015") { | ||
| cmd.arg("--edition=2015"); | ||
| } else { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters