Reintroduce rustc_llvm dependency in rustc

The dependency was removed in
352b44d1fa9ec2c969d7c8360106e6838233bcba, but it is needed in order to
compute the target features.

diff --git a/mk/crates.mk b/mk/crates.mk
index dafda75f5fe7d883ba564bd2b5003828ab1486c3..fedf6baeee3054c78557660b6ad4f4c3c0e95e91 100644 (file)
--- a/mk/crates.mk
+++ b/mk/crates.mk
@@ -97,7 +97,7 @@ DEPS_rustc_const_eval := rustc_const_math rustc syntax log serialize \
                                             rustc_back graphviz
 
 DEPS_rustc := syntax fmt_macros flate arena serialize getopts rbml \
-              log graphviz rustc_back rustc_data_structures\
+              log graphviz rustc_llvm rustc_back rustc_data_structures\
                          rustc_const_math
 DEPS_rustc_back := std syntax flate log libc
 DEPS_rustc_borrowck := rustc rustc_mir log graphviz syntax

diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml
index d77268219fcecb76e1fcf7730527da81085da824..9291227a734f78b7978aedfe79368c5ab1402257 100644 (file)
--- a/src/librustc/Cargo.toml
+++ b/src/librustc/Cargo.toml
@@ -19,5 +19,6 @@ rustc_back = { path = "../librustc_back" }
 rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_const_math = { path = "../librustc_const_math" }
 rustc_data_structures = { path = "../librustc_data_structures" }
+rustc_llvm = { path = "../librustc_llvm" }
 serialize = { path = "../libserialize" }
 syntax = { path = "../libsyntax" }

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index deb206277722071cfbd8f903aca237d5f9b67a56..1947cb695e45c314cf2f0644b772b7afa13e1fe5 100644 (file)
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -51,6 +51,7 @@
 extern crate graphviz;
 extern crate libc;
 extern crate rbml;
+extern crate rustc_llvm as llvm;
 extern crate rustc_back;
 extern crate rustc_data_structures;
 extern crate serialize;