From 93a71b1a11f86cb8b30a29173955b9b4a6f49160 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Thu, 11 Dec 2014 12:03:56 -0500
Subject: [PATCH] rustc: be more careful about detecting local rustc for
 bootstrap

---
 recipes/rust/rust.inc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/recipes/rust/rust.inc b/recipes/rust/rust.inc
index 9144b45..39c383d 100644
--- a/recipes/rust/rust.inc
+++ b/recipes/rust/rust.inc
@@ -272,11 +272,14 @@ do_configure () {
 	# where we're reinstalling the compiler. May want to try for a real
 	# path based on bitbake vars
         # Also will be wrong when relative libdir and/or bindir aren't 'bin' and 'lib'.
-        local_rust_root=$(dirname $(dirname $(which rustc)))
-        if [ -e "$local_rust_root/bin/rustc" ]; then
-            local_maybe_enable=enable
-        else
-            local_maybe_enable=disable
+        local_rustc=$(which rustc)
+        local_maybe_enable=disable
+        local_rust_root=/not/set/do/not/use
+        if [ -n "$local_rustc" ]; then
+            local_rust_root=$(dirname $(dirname $local_rustc))
+            if [ -e "$local_rust_root/bin/rustc" ]; then
+                local_maybe_enable=enable
+            fi
         fi
 
 	# - rpath is required otherwise rustc fails to resolve symbols