From d05c4d545963bbddb18062a8cc5a9ac489374d5e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 31 Jul 2019 15:04:25 -0700 Subject: 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. --- src/librustc_codegen_llvm/Cargo.toml | 1 - src/librustc_codegen_llvm/lib.rs | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src/librustc_codegen_llvm') 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; -- cgit 1.4.1-3-g733a5