about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2021-07-26 16:11:24 +0200
committerbjorn3 <bjorn3@users.noreply.github.com>2021-07-26 16:11:24 +0200
commit2abc12daada0f7a12285902eb3faacd279316e11 (patch)
tree9b837eb5f9f4c3aca9a6bf482727e512d17c539f
parent405642b853413705e660c011a5c7807f42e56479 (diff)
downloadrust-2abc12daada0f7a12285902eb3faacd279316e11.tar.gz
rust-2abc12daada0f7a12285902eb3faacd279316e11.zip
Fix y.rs build --sysroot llvm
-rw-r--r--build_system/build_sysroot.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/build_system/build_sysroot.rs b/build_system/build_sysroot.rs
index 9fb88c27961..642abc41f45 100644
--- a/build_system/build_sysroot.rs
+++ b/build_system/build_sysroot.rs
@@ -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")