diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-09-03 21:50:01 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-09-05 12:35:18 -0400 |
| commit | 3f1dc326edee5528db80894eedd2036fdc05bca8 (patch) | |
| tree | 40d1ee81559b8b6f74f5328befa85b013ddb232d | |
| parent | b437240ceefaad3cdf92ad7e9d1255b8da88dbb3 (diff) | |
| download | rust-3f1dc326edee5528db80894eedd2036fdc05bca8.tar.gz rust-3f1dc326edee5528db80894eedd2036fdc05bca8.zip | |
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.
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/Cargo.toml | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index 243a326646c..e0b0640178b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3129,11 +3129,7 @@ dependencies = [ name = "rustc_codegen_llvm" version = "0.0.0" dependencies = [ - "cc", - "memmap", - "num_cpus", "rustc_llvm", - "tempfile", ] [[package]] diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml index 5e1b0eafdec..98efa6a5804 100644 --- a/src/librustc_codegen_llvm/Cargo.toml +++ b/src/librustc_codegen_llvm/Cargo.toml @@ -11,11 +11,7 @@ crate-type = ["dylib"] test = false [dependencies] -cc = "1.0.1" # Used to locate MSVC -num_cpus = "1.0" -tempfile = "3.0" rustc_llvm = { path = "../librustc_llvm" } -memmap = "0.6" [features] # This is used to convince Cargo to separately cache builds of `rustc_codegen_llvm` |