Skip to content

Commit 3f1dc32

Browse files
Remove codegen dependencies
Not doing this leads to building two copies of e.g. num_cpus in the sysroot and _llvm deps, leading to conflicts between the two when compiling librustc_codegen_llvm. It's not entirely clear why this is the case after the changes in this PR but likely has something to do with a subtle difference in ordering or similar.
1 parent b437240 commit 3f1dc32

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

Cargo.lock

-4
Original file line numberDiff line numberDiff line change
@@ -3129,11 +3129,7 @@ dependencies = [
31293129
name = "rustc_codegen_llvm"
31303130
version = "0.0.0"
31313131
dependencies = [
3132-
"cc",
3133-
"memmap",
3134-
"num_cpus",
31353132
"rustc_llvm",
3136-
"tempfile",
31373133
]
31383134

31393135
[[package]]

src/librustc_codegen_llvm/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ crate-type = ["dylib"]
1111
test = false
1212

1313
[dependencies]
14-
cc = "1.0.1" # Used to locate MSVC
15-
num_cpus = "1.0"
16-
tempfile = "3.0"
1714
rustc_llvm = { path = "../librustc_llvm" }
18-
memmap = "0.6"
1915

2016
[features]
2117
# This is used to convince Cargo to separately cache builds of `rustc_codegen_llvm`

0 commit comments

Comments
 (0)