From 182090799070604e6755262b446549cb0615645b Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 7 Mar 2017 20:25:13 -0600
Subject: [PATCH] compiler-rt: remove standalone build for Rust 1.15

From Rust 1.15 a standalone build of compiler-rt is no longer necessary.
---
 recipes-devtools/rust/compiler-rt_1.15.1.bb | 4 ----
 recipes-devtools/rust/libstd-rs.inc         | 2 --
 recipes-devtools/rust/libstd-rs_1.12.1.bb   | 5 +++++
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 recipes-devtools/rust/compiler-rt_1.15.1.bb

diff --git a/recipes-devtools/rust/compiler-rt_1.15.1.bb b/recipes-devtools/rust/compiler-rt_1.15.1.bb
deleted file mode 100644
index b7b8f50..0000000
--- a/recipes-devtools/rust/compiler-rt_1.15.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require compiler-rt.inc
-require rust-source-${PV}.inc
-
-EXTRA_OECONF = "--disable-rustbuild"
diff --git a/recipes-devtools/rust/libstd-rs.inc b/recipes-devtools/rust/libstd-rs.inc
index 21a312a..5bcfb69 100644
--- a/recipes-devtools/rust/libstd-rs.inc
+++ b/recipes-devtools/rust/libstd-rs.inc
@@ -4,8 +4,6 @@ SECTION = "devel"
 LICENSE = "MIT | Apache-2.0"
 LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=43e1f1fb9c0ee3af66693d8c4fecafa8"
 
-DEPENDS += "compiler-rt (=${PV})"
-
 RUSTLIB_DEP = ""
 inherit cargo
 
diff --git a/recipes-devtools/rust/libstd-rs_1.12.1.bb b/recipes-devtools/rust/libstd-rs_1.12.1.bb
index d8e02b2..0957cbb 100644
--- a/recipes-devtools/rust/libstd-rs_1.12.1.bb
+++ b/recipes-devtools/rust/libstd-rs_1.12.1.bb
@@ -4,3 +4,8 @@ require libstd-rs.inc
 SRC_URI += "\
 	crate://crates.io/gcc/0.3.27 \
 "
+
+# not necessary from Rust 1.15.x and newer as its built
+# as a cargo crate with libstd
+DEPENDS += "compiler-rt (=${PV})"
+