Skip to content

dev-lang/rust: crossdev rust (draft) #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
peppergrayxyz wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

dev-lang/rust: crossdev rust (draft) #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions crossdev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ done

# grab user settings
d="${CONFIGROOT}/crossdev/${CTARGET}"
for v in MULTILIB_ABIS USE BVER GVER KVER LVER DVER STAGE CFLAGS LDFLAGS ASFLAGS ; do
for v in MULTILIB_ABIS USE BVER GVER KVER LVER DVER STAGE CFLAGS LDFLAGS ASFLAGS RUSTFLAGS ; do
if [[ -e ${d}/${v} ]] ; then
# yes, quotes are needed in this instance (export $var="...")
export ${v}="$(<"${d}"/${v})"
Expand All @@ -1227,7 +1227,7 @@ load_multilib_env() {
CTARGET=${!var}

# clean the env in our subshell
unset ${!CFLAGS_*} ${!CHOST_*} ${!CTARGET_*} ${!LDFLAGS_*} ${!LIBDIR_*}
unset ${!CFLAGS_*} ${!CHOST_*} ${!CTARGET_*} ${!LDFLAGS_*} ${!RUSTFLAGS*} ${!LIBDIR_*}

# ask multilib.eclass to tell us how things work
inherit() { :; }
Expand All @@ -1249,7 +1249,7 @@ load_multilib_env() {
${single_abi} && MULTILIB_ABIS=${DEFAULT_ABI}

# output the desired env
for v in ${!CFLAGS_*} ${!CHOST_*} ${!CTARGET_*} ${!LDFLAGS_*} ${!LIBDIR_*} ; do
for v in ${!CFLAGS_*} ${!CHOST_*} ${!CTARGET_*} ${!LDFLAGS_*} ${!RUSTFLAGS*} ${!LIBDIR_*} ; do
echo ${v}=\'${!v}\'
done
# output the variables that are not uniquely named
Expand All @@ -1262,7 +1262,8 @@ load_multilib_env() {
def_CFLAGS=
def_LIBDIR="lib"
def_LDFLAGS=
for v in CFLAGS LIBDIR LDFLAGS ; do
def RUSTFLAGS=
for v in CFLAGS LIBDIR LDFLAGS RUSTFLAGS ; do
d="def_${v}"
for a in ${MULTILIB_ABIS} ; do
_v="${v}_${a}"
Expand Down Expand Up @@ -1511,7 +1512,7 @@ set_env() {
;;
esac
local v
for v in ${!CFLAGS_*} ${!CHOST_*} ${!CTARGET_*} ${!LDFLAGS_*} ${!LIBDIR_*} ABI MULTILIB_ABIS DEFAULT_ABI ; do
for v in ${!CFLAGS_*} ${!CHOST_*} ${!CTARGET_*} ${!LDFLAGS_*} ${!RUSTFLAGS*} ${!LIBDIR_*} ABI MULTILIB_ABIS DEFAULT_ABI ; do
echo "${v}='${!v}'"
done >> "${output}"

Expand Down