Skip to content

Commit 4825e12

Browse files
committedJul 22, 2020
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
2 parents aca77cd + 79673d3 commit 4825e12

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎src/bootstrap/dist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ impl Step for Src {
10051005
// (essentially libstd and all of its path dependencies)
10061006
let std_src_dirs = [
10071007
"src/build_helper",
1008-
"src/backtrace",
1008+
"src/backtrace/src",
10091009
"src/liballoc",
10101010
"src/libcore",
10111011
"src/libpanic_abort",

0 commit comments

Comments
 (0)
Please sign in to comment.