diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-06 15:36:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 15:36:34 +0200 |
| commit | fbf268bfd49cba66cc5836d7f31281a77bbbb1b3 (patch) | |
| tree | baa40da9babb55c84458d558e39afabc286f659b | |
| parent | 949b49a53da88d244796b652a0780a74dbf132d1 (diff) | |
| parent | d05c4d545963bbddb18062a8cc5a9ac489374d5e (diff) | |
| download | rust-fbf268bfd49cba66cc5836d7f31281a77bbbb1b3.tar.gz rust-fbf268bfd49cba66cc5836d7f31281a77bbbb1b3.zip | |
Rollup merge of #63296 - alexcrichton:deduplicate-demangle, r=Mark-Simulacrum
Deduplicate rustc_demangle in librustc_codegen_llvm This commit removes the crates.io dependency of `rustc-demangle` from `rustc_codegen_llvm`. This crate is actually already pulled in to part of the `librustc_driver` build and with the upcoming pipelining implementation in Cargo it causes build issues if `rustc-demangle` is left to its own devices. This is not currently required, but once pipelining is enabled for rustc's own build it will be required to build correctly.
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/lib.rs | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index 972276bb381..cb1e3d4d1d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2848,7 +2848,6 @@ dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_llvm 0.0.0", "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml index 291d32a0681..5e1b0eafdec 100644 --- a/src/librustc_codegen_llvm/Cargo.toml +++ b/src/librustc_codegen_llvm/Cargo.toml @@ -14,7 +14,6 @@ test = false cc = "1.0.1" # Used to locate MSVC num_cpus = "1.0" tempfile = "3.0" -rustc-demangle = "0.1.15" rustc_llvm = { path = "../librustc_llvm" } memmap = "0.6" diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index a630817fb33..653dd8868f4 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -25,6 +25,7 @@ use back::write::{create_target_machine, create_informational_target_machine}; use syntax_pos::symbol::Symbol; +extern crate rustc_demangle; extern crate flate2; #[macro_use] extern crate bitflags; extern crate libc; |