From f6a6687733fc543880d9f98064e8eb5fe563bc0e Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Tue, 30 Dec 2014 16:00:12 -0500
Subject: [PATCH] USE_LOCAL_RUST tweaks

---
 classes/internal-rust-native.bbclass | 2 +-
 recipes/rust/rust.inc                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/internal-rust-native.bbclass b/classes/internal-rust-native.bbclass
index 8af37a3..2261a8a 100644
--- a/classes/internal-rust-native.bbclass
+++ b/classes/internal-rust-native.bbclass
@@ -7,4 +7,4 @@ INHIBIT_DEFAULT_RUST_DEPS = "1"
 PROVIDES = "virtual/${TARGET_PREFIX}rust"
 
 USE_LOCAL_NATIVE_RUST ??= "0"
-USE_LOCAL_RUST = "${@base_conditional('USE_LOCAL_NATIVE_RUST', '0', '0', '1', d)}"
+USE_LOCAL_RUST ?= "${@base_conditional('USE_LOCAL_NATIVE_RUST', '0', '0', '1', d)}"
diff --git a/recipes/rust/rust.inc b/recipes/rust/rust.inc
index 246d95d..1dfadc9 100644
--- a/recipes/rust/rust.inc
+++ b/recipes/rust/rust.inc
@@ -310,7 +310,7 @@ do_configure () {
 		"--mandir=${mandir}"			\
 		"--libdir=${libdir}"			\
 		"--bindir=${bindir}"			\
-		${@base_conditional('USE_LOCAL_RUST', '1', '--$local_maybe_enable-local-rust --local-rust-root=$local_rust_root', '', d)} \
+		${@base_conditional('USE_LOCAL_RUST', '1', '--$local_maybe_enable-local-rust --local-rust-root=$local_rust_root', '--local-rust-root=/not/a/dir', d)} \
 		${EXTRA_OECONF}
 }