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

rust: correct use of local-rust-root

Browse Source
This commit is contained in:
Cody P Schafer
2014-11-20 00:29:22 -05:00
parent 14e65efd33
commit 74934547f2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/rust/rust.inc
+8 -1
View File
@@ -236,6 +236,13 @@ do_configure () {
# FIXME: this path to rustc (via `which rustc`) may not be quite right in the case # FIXME: this path to rustc (via `which rustc`) may not be quite right in the case
# 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'.
local_rust_root=$(dirname $(dirname $(which rustc)))
if [ -e "$local_rust_root/bin/rustc" ]; then
local_maybe_enable=enable
else
local_maybe_enable=disable
fi
# - rpath is required otherwise rustc fails to resolve symbols # - rpath is required otherwise rustc fails to resolve symbols
# - submodule management is done by bitbake's fetching # - submodule management is done by bitbake's fetching
@@ -254,7 +261,7 @@ do_configure () {
"--libdir=${libdir}" \ "--libdir=${libdir}" \
"--bindir=${bindir}" \ "--bindir=${bindir}" \
"--disable-manage-submodules" \ "--disable-manage-submodules" \
${@base_conditional('USE_LOCAL_RUST', '1', '--enable-local-rust --local-rust-root=$(which rustc)', '', d)} \ ${@base_conditional('USE_LOCAL_RUST', '1', '--$local_maybe_enable-local-rust --local-rust-root=$local_rust_root', '', d)} \
${EXTRA_OECONF} ${EXTRA_OECONF}
} }