Skip to content

Commit 6453f68

Browse files
committed
rust-src: include everything needed to compile libstd with jemalloc
1 parent 5b13bff commit 6453f68

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/bootstrap/dist.rs

+15-1
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@ pub fn rust_src(build: &Build) {
499499
"src/liballoc",
500500
"src/liballoc_jemalloc",
501501
"src/liballoc_system",
502+
"src/libbacktrace",
502503
"src/libcollections",
503504
"src/libcompiler_builtins",
504505
"src/libcore",
@@ -514,12 +515,25 @@ pub fn rust_src(build: &Build) {
514515
"src/libstd_unicode",
515516
"src/libunwind",
516517
"src/rustc/libc_shim",
518+
"src/libtest",
519+
"src/libterm",
520+
"src/libgetopts",
521+
"src/compiler-rt",
522+
"src/jemalloc",
523+
];
524+
let std_src_dirs_exclude = [
525+
"src/compiler-rt/test",
526+
"src/jemalloc/test/unit",
517527
];
518528

519529
for item in &std_src_dirs {
520530
let dst = &dst_src.join(item);
521531
t!(fs::create_dir_all(dst));
522-
cp_r(&plain_dst_src.join(item), dst);
532+
cp_filtered(&plain_dst_src.join(item), dst,
533+
&|path| {
534+
let item_path = Path::new(item).join(path);
535+
!std_src_dirs_exclude.iter().any(|excl| item_path == Path::new(excl))
536+
} );
523537
}
524538

525539
// Create source tarball in rust-installer format

0 commit comments

Comments
 (0)