MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-23 13:24:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow passing of rustflags from prefix to xargo

Browse Source
This commit is contained in:
Jeremy Soller 2019-04-19 21:22:46 -06:00
parent 24cf46a58c
commit 26187c28be
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cook.sh
View File

@ -6,7 +6,7 @@ source config.sh
# Variables to be overriden by recipes
export BINDIR=bin
export CARGO=xargo
export CARGO=(env RUSTFLAGS="$PREFIX_RUSTFLAGS" xargo)
export CARGOBUILD=rustc
export CARGOFLAGS=
export DEBUG=
@ -230,7 +230,7 @@ function op {
fi
if [ "$skip" -eq "0" ]
then
"${CARGO}" update
"${CARGO[@]}" update
fi
popd > /dev/null
;;
@ -313,7 +313,7 @@ function op {
if [ "$skip" -eq "0" ]
then
cp -p "$ROOT/Xargo.toml" "Xargo.toml"
"${CARGO}" "$CARGOBUILD" --target "$TARGET" $release_flag $CARGOFLAGS
"${CARGO[@]}" "$CARGOBUILD" --target "$TARGET" $release_flag $CARGOFLAGS
fi
popd > /dev/null
;;
@ -334,7 +334,7 @@ function op {
if [ "$skip" -eq "0" ]
then
cp -p "$ROOT/Xargo.toml" "Xargo.toml"
"${CARGO}" test --no-run --target "$TARGET" $release_flag $CARGOFLAGS
"${CARGO[@]}" test --no-run --target "$TARGET" $release_flag $CARGOFLAGS
fi
popd > /dev/null
;;
@ -347,7 +347,7 @@ function op {
fi
if [ "$skip" -eq "0" ]
then
"${CARGO}" clean
"${CARGO[@]}" clean
fi
popd > /dev/null
;;
@ -363,7 +363,7 @@ function op {
fi
if [ "$skip" -eq "0" ]
then
#TODO "${CARGO}" install --root "$stage" $CARGOFLAGS
#TODO "${CARGO[@]}" install --root "$stage" $CARGOFLAGS
if [ "$DEBUG" == 1 ]
then
build=debug