Disable gcc-rs hack, fixup rust-native deps

classes/internal-rust-native.bbclass

@@ -1,5 +1,10 @@
 inherit native
 PN = "rust-native"
 
+# Otherwise we'll depend on what we provide
+INHIBIT_DEFAULT_DEPS = "1"
+# We don't need to depend on gcc-native because yocto assumes it exists
+PROVIDES = "virtual/${TARGET_PREFIX}rust"
+
 USE_LOCAL_NATIVE_RUST ??= "0"
 USE_LOCAL_RUST = "${@base_conditional('USE_LOCAL_NATIVE_RUST', '0', '0', '1', d)}"

classes/rust.bbclass

@@ -10,6 +10,8 @@ def rust_base_dep(d):
     if not d.getVar('INHIBIT_DEFAULT_DEPS'):
         if (d.getVar('HOST_SYS', True) != d.getVar('BUILD_SYS', True)):
             deps += " virtual/${TARGET_PREFIX}rust"
+        else:
+            deps += " rust-native"
     return deps
 
 BASEDEPENDS_append = " ${@rust_base_dep(d)}"

recipes/cargo/cargo_2014-11-25.bb

@@ -7,8 +7,8 @@ SRC_URI += " \
 	file://curl-rust/0001-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch;patchdir=../curl-rust \
 \
 	git://github.com/alexcrichton/gcc-rs.git;protocol=https;name=gcc-rs;destsuffix=gcc-rs \
-	file://gcc-rs/0001-XXX-hacks.patch;patchdir=../gcc-rs \
 "
+#file://gcc-rs/0001-XXX-hacks.patch;patchdir=../gcc-rs
 
 SRCREV_curl-rust = "c1b96e146f6752353a1e84cca932c628e6bf73af"
 SRCREV_gcc-rs = "903e8f8a2e3766ad3d514404d452dbaa1d3b2d79"