mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rust: be even more carful while probing

Browse Source
This commit is contained in:
Cody P Schafer
2014-12-11 12:42:28 -05:00
parent 93a71b1a11
commit 9cfaa4936f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/rust/rust.inc
+7 -5
View File
@@ -272,13 +272,15 @@ do_configure () {
# where we're reinstalling the compiler. May want to try for a real # where we're reinstalling the compiler. May want to try for a real
# path based on bitbake vars # path based on bitbake vars
# Also will be wrong when relative libdir and/or bindir aren't 'bin' and 'lib'. # Also will be wrong when relative libdir and/or bindir aren't 'bin' and 'lib'.
local_rustc=$(which rustc)
local_maybe_enable=disable local_maybe_enable=disable
local_rust_root=/not/set/do/not/use local_rust_root=/not/set/do/not/use
if [ -n "$local_rustc" ]; then if which rustc >/dev/null 2>&1; then
local_rust_root=$(dirname $(dirname $local_rustc)) local_rustc=$(which rustc)
if [ -e "$local_rust_root/bin/rustc" ]; then if [ -n "$local_rustc" ]; then
local_maybe_enable=enable local_rust_root=$(dirname $(dirname $local_rustc))
if [ -e "$local_rust_root/bin/rustc" ]; then
local_maybe_enable=enable
fi
fi fi
fi fi