Skip to content

Commit

Permalink
Auto merge of rust-lang#74578 - ehuss:fix-rust-src, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Fix rust-src component.

The rust-src component could not be installed by rustup because it included some symbolic links. rust-lang#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 rust-lang#74577
  • Loading branch information
bors committed Jul 22, 2020
2 parents aca77cd + 79673d3 commit 4825e12
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 4825e12

Please sign in to comment.