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

rust: fix use local goop

Browse Source
This commit is contained in:
Cody P Schafer
2014-11-19 22:46:25 -05:00
parent 69439233e4
commit fb9cce760a
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/rust/rust.inc
+2 -7
View File
@@ -233,14 +233,9 @@ do_configure () {
unset CXXFLAGS unset CXXFLAGS
unset CPPFLAGS unset CPPFLAGS
if [ "${USE_LOCAL_RUST}" -eq 1 ]; then # FIXME: this path to rustc (via `which rustc`) may not be quite right in the case
# FIXME: this path to 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
my_conf="--enable-local-rust --local-rust-root=$(dirname $(which rustc))"
else
my_conf=""
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
@@ -259,7 +254,7 @@ do_configure () {
"--libdir=${libdir}" \ "--libdir=${libdir}" \
"--bindir=${bindir}" \ "--bindir=${bindir}" \
"--disable-manage-submodules" \ "--disable-manage-submodules" \
${my_conf} \ ${@base_conditional('USE_LOCAL_RUST', '1', '--enable-local-rust --local-rust-root=$(which rustc)', '', d)} \
${EXTRA_OECONF} ${EXTRA_OECONF}
} }