From 60e4158188b6f580e8fe44f5a52edd3f06e62a83 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Mon, 19 Nov 2018 18:28:44 +0100
Subject: [PATCH] Move fake rustc_codegen_ssa dependency from rustc_driver to
 rustc-main

---
 Cargo.lock                     | 2 +-
 src/librustc_driver/Cargo.toml | 4 ----
 src/rustc/Cargo.toml           | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 44c787e74ad..9f109997ad5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2064,6 +2064,7 @@ dependencies = [
 name = "rustc-main"
 version = "0.0.0"
 dependencies = [
+ "rustc_codegen_ssa 0.0.0",
  "rustc_driver 0.0.0",
  "rustc_target 0.0.0",
 ]
@@ -2246,7 +2247,6 @@ dependencies = [
  "rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_allocator 0.0.0",
  "rustc_borrowck 0.0.0",
- "rustc_codegen_ssa 0.0.0",
  "rustc_codegen_utils 0.0.0",
  "rustc_data_structures 0.0.0",
  "rustc_errors 0.0.0",
diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml
index d37186b61d3..1e32f5ef6f0 100644
--- a/src/librustc_driver/Cargo.toml
+++ b/src/librustc_driver/Cargo.toml
@@ -39,10 +39,6 @@ smallvec = { version = "0.6.5", features = ["union"] }
 syntax_ext = { path = "../libsyntax_ext" }
 syntax_pos = { path = "../libsyntax_pos" }
 
-# Make sure rustc_codegen_ssa ends up in the sysroot, because this
-# crate is intended to be used by codegen backends, which may not be in-tree.
-rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
-
 [dependencies.jemalloc-sys]
 version = '0.1.8'
 optional = true
diff --git a/src/rustc/Cargo.toml b/src/rustc/Cargo.toml
index ec822fddef3..32969d09e85 100644
--- a/src/rustc/Cargo.toml
+++ b/src/rustc/Cargo.toml
@@ -11,5 +11,9 @@ path = "rustc.rs"
 rustc_target = { path = "../librustc_target" }
 rustc_driver = { path = "../librustc_driver" }
 
+# Make sure rustc_codegen_ssa ends up in the sysroot, because this
+# crate is intended to be used by codegen backends, which may not be in-tree.
+rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
+
 [features]
 jemalloc = ['rustc_driver/jemalloc-sys']