From de5b9d0cea81caea7caf78af706d66f300c6e5d2 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 6 Jul 2015 15:25:03 -0400
Subject: [PATCH] rust-llvm: adjust to use BBCLASSEXTEND and the generic
 DEPENDS for some chance of class-target working

---
 .../rust/{rust-llvm-native_1.1.0.bb => rust-llvm_1.1.0.bb}    | 4 +++-
 recipes/rust/rust.inc                                         | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename recipes/rust/{rust-llvm-native_1.1.0.bb => rust-llvm_1.1.0.bb} (96%)

diff --git a/recipes/rust/rust-llvm-native_1.1.0.bb b/recipes/rust/rust-llvm_1.1.0.bb
similarity index 96%
rename from recipes/rust/rust-llvm-native_1.1.0.bb
rename to recipes/rust/rust-llvm_1.1.0.bb
index 51fc3d3..1a35a4e 100644
--- a/recipes/rust/rust-llvm-native_1.1.0.bb
+++ b/recipes/rust/rust-llvm_1.1.0.bb
@@ -11,7 +11,6 @@ SRC_URI[rust.sha256sum] = "cb09f443b37ec1b81fe73c04eb413f9f656859cf7d00bc5088008
 S = "${WORKDIR}/rustc-${PV}/src/llvm"
 
 inherit autotools
-inherit native
 
 EXTRA_OECONF += "--enable-targets=x86,x86_64,arm,aarch64,mips,powerpc"
 EXTRA_OECONF += "--enable-optimized"
@@ -26,3 +25,6 @@ do_install_append () {
 		ln -s $i llvm-$link
 	done
 }
+
+BBCLASSEXTEND = "native"
+
diff --git a/recipes/rust/rust.inc b/recipes/rust/rust.inc
index e80c9f7..1ab0246 100644
--- a/recipes/rust/rust.inc
+++ b/recipes/rust/rust.inc
@@ -8,8 +8,7 @@ LICENSE = "MIT | Apache-2.0"
 
 B = "${WORKDIR}/build"
 
-DEPENDS += "rust-llvm-native"
-DEPENDS_class-cross += "rust-llvm-native"
+DEPENDS += "rust-llvm"
 
 # Avoid having the default bitbake.conf disable sub-make parallelization
 EXTRA_OEMAKE = ""