mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #80315 - tmiasko:ignore-proc-macros, r=Mark-Simulacrum

Browse Source 
Ignore proc-macros when assembling rustc libdir

Fixes #80294.
This commit is contained in:
bors 2020-12-27 16:03:01 +00:00
commit 76188b6830
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bootstrap/compile.rs
View File

@ -7,6 +7,7 @@
//! goes along from the output of the previous stage.
use std::borrow::Cow;
use std::collections::HashSet;
use std::env;
use std::fs;
use std::io::prelude::*;
@ -991,13 +992,26 @@ fn run(self, builder: &Builder<'_>) -> Compiler {
builder.info(&format!("Assembling stage{} compiler ({})", stage, host));
// Link in all dylibs to the libdir
let stamp = librustc_stamp(builder, build_compiler, target_compiler.host);
let proc_macros = builder
.read_stamp_file(&stamp)
.into_iter()
.filter_map(|(path, dependency_type)| {
if dependency_type == DependencyType::Host {
Some(path.file_name().unwrap().to_owned().into_string().unwrap())
} else {
None
}
})
.collect::<HashSet<_>>();
let sysroot = builder.sysroot(target_compiler);
let rustc_libdir = builder.rustc_libdir(target_compiler);
t!(fs::create_dir_all(&rustc_libdir));
let src_libdir = builder.sysroot_libdir(build_compiler, host);
for f in builder.read_dir(&src_libdir) {
let filename = f.file_name().into_string().unwrap();
if is_dylib(&filename) {
if is_dylib(&filename) && !proc_macros.contains(&filename) {
builder.copy(&f.path(), &rustc_libdir.join(&filename));
}
}