diff options
| author | bors <bors@rust-lang.org> | 2020-07-22 02:51:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-22 02:51:58 +0000 |
| commit | 4825e12fc9c79954aa0fe18f5521efa6c19c7539 (patch) | |
| tree | 23980a5bee7dc0c5411594d568e7c60a517c1b9b | |
| parent | aca77cdd8ff05218318a7ba7f750984ba48eb1f3 (diff) | |
| parent | 79673d300915f846726c27b9e1974dc451013ee9 (diff) | |
| download | rust-4825e12fc9c79954aa0fe18f5521efa6c19c7539.tar.gz | |
Auto merge of #74578 - ehuss:fix-rust-src, r=Mark-Simulacrum
Fix rust-src component.
The rust-src component could not be installed by rustup because it included some symbolic links. #74520 added the backtrace directory which included some symlinks. Since the rust-src component doesn't need most of the files in the `backtrace` submodule, this changes it to only include the minimum necessary.
Tested with cargo's build-std that it can build from the resulting tarball.
Fixes #74577
| -rw-r--r-- | src/bootstrap/dist.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 263c7b93fe5..14c22605e81 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1005,7 +1005,7 @@ impl Step for Src { // (essentially libstd and all of its path dependencies) let std_src_dirs = [ "src/build_helper", - "src/backtrace", + "src/backtrace/src", "src/liballoc", "src/libcore", "src/libpanic_abort", |