bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit '05677b6bd6' into sync_cg_clif-2021-08-06

Browse source
This commit is contained in:
bjorn3 2021-08-06 16:26:56 +02:00
commit 279f486960
40 changed files with 823 additions and 590 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs
View file

@ -91,7 +91,9 @@ pub(crate) fn build_sysroot(
{
let file = file.unwrap().path();
let file_name_str = file.file_name().unwrap().to_str().unwrap();
if file_name_str.contains("rustc_")
if (file_name_str.contains("rustc_")
&& !file_name_str.contains("rustc_std_workspace_")
&& !file_name_str.contains("rustc_demangle"))
|| file_name_str.contains("chalk")
|| file_name_str.contains("tracing")
|| file_name_str.contains("regex")