Remove unnecessary dependencies on rustc_llvm.

10 files changed, 7 insertions, 19 deletions

diff --git a/mk/crates.mk b/mk/crates.mk
index 05018d2a940..f5622aef551 100644
--- a/mk/crates.mk
+++ b/mk/crates.mk
@@ -94,9 +94,9 @@ DEPS_syntax_ext := syntax fmt_macros
 DEPS_rustc_const_eval := std syntax
 
 DEPS_rustc := syntax fmt_macros flate arena serialize getopts rbml rustc_front\
-              log graphviz rustc_llvm rustc_back rustc_data_structures\
+              log graphviz rustc_back rustc_data_structures\
 		  	  rustc_const_eval
-DEPS_rustc_back := std syntax rustc_llvm rustc_front flate log libc
+DEPS_rustc_back := std syntax rustc_front flate log libc
 DEPS_rustc_borrowck := rustc rustc_front rustc_mir log graphviz syntax
 DEPS_rustc_data_structures := std log serialize
 DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml
index 1f000c2af68..d2dc5f1ed93 100644
--- a/src/librustc/Cargo.toml
+++ b/src/librustc/Cargo.toml
@@ -21,6 +21,5 @@ rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_const_eval = { path = "../librustc_const_eval" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_front = { path = "../librustc_front" }
-rustc_llvm = { path = "../librustc_llvm" }
 serialize = { path = "../libserialize" }
 syntax = { path = "../libsyntax" }
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 4fdfe59e2b0..6b5f889fcfb 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -50,7 +50,6 @@ extern crate getopts;
 extern crate graphviz;
 extern crate libc;
 extern crate rbml;
-pub extern crate rustc_llvm as llvm;
 extern crate rustc_back;
 extern crate rustc_front;
 extern crate rustc_data_structures;
@@ -140,10 +139,6 @@ pub mod util {
     pub mod fs;
 }
 
-pub mod lib {
-    pub use llvm;
-}
-
 // A private module so that macro-expanded idents like
 // `::rustc::lint::Lint` will also work in `rustc` itself.
 //
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index bf532d9ccf9..0eef4b5221a 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -38,8 +38,6 @@ use std::env;
 use std::fmt;
 use std::path::PathBuf;
 
-use llvm;
-
 pub struct Config {
     pub target: Target,
     pub int_type: IntTy,
@@ -1052,10 +1050,6 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
     let dump_dep_graph = debugging_opts.dump_dep_graph;
     let no_analysis = debugging_opts.no_analysis;
 
-    if debugging_opts.debug_llvm {
-        unsafe { llvm::LLVMSetDebug(1); }
-    }
-
     let mut output_types = HashMap::new();
     if !debugging_opts.parse_only && !no_trans {
         for list in matches.opt_strs("emit") {
diff --git a/src/librustc_back/Cargo.toml b/src/librustc_back/Cargo.toml
index 255ca60e2b8..2cf6cbc4bcf 100644
--- a/src/librustc_back/Cargo.toml
+++ b/src/librustc_back/Cargo.toml
@@ -11,7 +11,6 @@ crate-type = ["dylib"]
 [dependencies]
 syntax = { path = "../libsyntax" }
 serialize = { path = "../libserialize" }
-rustc_llvm = { path = "../librustc_llvm" }
 rustc_front = { path = "../librustc_front" }
 log = { path = "../liblog" }
 
diff --git a/src/librustc_back/lib.rs b/src/librustc_back/lib.rs
index d854b9ed697..80dec2cd281 100644
--- a/src/librustc_back/lib.rs
+++ b/src/librustc_back/lib.rs
@@ -45,7 +45,6 @@
 extern crate syntax;
 extern crate libc;
 extern crate serialize;
-extern crate rustc_llvm;
 extern crate rustc_front;
 #[macro_use] extern crate log;
 
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index d8d1cf5a026..057a34c27b1 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -166,6 +166,10 @@ pub fn run_compiler<'a>(args: &[String],
 
     let sopts = config::build_session_options(&matches);
 
+    if sopts.debugging_opts.debug_llvm {
+        unsafe { llvm::LLVMSetDebug(1); }
+    }
+
     let descriptions = diagnostics_registry();
 
     do_or_return!(callbacks.early_callback(&matches,
diff --git a/src/librustc_platform_intrinsics/Cargo.toml b/src/librustc_platform_intrinsics/Cargo.toml
index 97bf4f854cc..abdc3b3d636 100644
--- a/src/librustc_platform_intrinsics/Cargo.toml
+++ b/src/librustc_platform_intrinsics/Cargo.toml
@@ -9,5 +9,4 @@ path = "lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
-rustc_llvm = { path = "../librustc_llvm" }
 rustc = { path = "../librustc" }
diff --git a/src/librustc_platform_intrinsics/lib.rs b/src/librustc_platform_intrinsics/lib.rs
index 9736d558769..fdd9b7d8fd3 100644
--- a/src/librustc_platform_intrinsics/lib.rs
+++ b/src/librustc_platform_intrinsics/lib.rs
@@ -16,7 +16,6 @@
 #![cfg_attr(not(stage0), deny(warnings))]
 #![allow(bad_style)]
 
-extern crate rustc_llvm as llvm;
 extern crate rustc;
 
 use rustc::ty::TyCtxt;
diff --git a/src/test/run-make/execution-engine/test.rs b/src/test/run-make/execution-engine/test.rs
index 7454bbfb531..81ad276ca68 100644
--- a/src/test/run-make/execution-engine/test.rs
+++ b/src/test/run-make/execution-engine/test.rs
@@ -16,6 +16,7 @@ extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_front;
 extern crate rustc_lint;
+extern crate rustc_llvm as llvm;
 extern crate rustc_metadata;
 extern crate rustc_resolve;
 #[macro_use] extern crate syntax;
@@ -28,7 +29,6 @@ use std::thread::Builder;
 
 use rustc::dep_graph::DepGraph;
 use rustc::front::map as ast_map;
-use rustc::llvm;
 use rustc::middle::cstore::{CrateStore, LinkagePreference};
 use rustc::ty;
 use rustc::session::config::{self, basic_options, build_configuration, Input, Options};