From 64a35f9d23d983dac2c38c0a97627785f7c5dbfd Mon Sep 17 00:00:00 2001
From: Andrea Canciani <ranma42@gmail.com>
Date: Wed, 30 Mar 2016 12:11:58 +0200
Subject: [PATCH] Reintroduce rustc_llvm dependency in rustc

The dependency was removed in
352b44d1fa9ec2c969d7c8360106e6838233bcba, but it is needed in order to
compute the target features.
---
 mk/crates.mk            | 2 +-
 src/librustc/Cargo.toml | 1 +
 src/librustc/lib.rs     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mk/crates.mk b/mk/crates.mk
index dafda75f5fe..fedf6baeee3 100644
--- 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 d77268219fc..9291227a734 100644
--- 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 deb20627772..1947cb695e4 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -51,6 +51,7 @@ extern crate getopts;
 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;