Skip to content
Snippets Groups Projects
Verified Commit 26187c28 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Allow passing of rustflags from prefix to xargo

parent 24cf46a5
Branches
Tags
No related merge requests found
...@@ -6,7 +6,7 @@ source config.sh ...@@ -6,7 +6,7 @@ source config.sh
# Variables to be overriden by recipes # Variables to be overriden by recipes
export BINDIR=bin export BINDIR=bin
export CARGO=xargo export CARGO=(env RUSTFLAGS="$PREFIX_RUSTFLAGS" xargo)
export CARGOBUILD=rustc export CARGOBUILD=rustc
export CARGOFLAGS= export CARGOFLAGS=
export DEBUG= export DEBUG=
...@@ -230,7 +230,7 @@ function op { ...@@ -230,7 +230,7 @@ function op {
fi fi
if [ "$skip" -eq "0" ] if [ "$skip" -eq "0" ]
then then
"${CARGO}" update "${CARGO[@]}" update
fi fi
popd > /dev/null popd > /dev/null
;; ;;
...@@ -313,7 +313,7 @@ function op { ...@@ -313,7 +313,7 @@ function op {
if [ "$skip" -eq "0" ] if [ "$skip" -eq "0" ]
then then
cp -p "$ROOT/Xargo.toml" "Xargo.toml" cp -p "$ROOT/Xargo.toml" "Xargo.toml"
"${CARGO}" "$CARGOBUILD" --target "$TARGET" $release_flag $CARGOFLAGS "${CARGO[@]}" "$CARGOBUILD" --target "$TARGET" $release_flag $CARGOFLAGS
fi fi
popd > /dev/null popd > /dev/null
;; ;;
...@@ -334,7 +334,7 @@ function op { ...@@ -334,7 +334,7 @@ function op {
if [ "$skip" -eq "0" ] if [ "$skip" -eq "0" ]
then then
cp -p "$ROOT/Xargo.toml" "Xargo.toml" 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 fi
popd > /dev/null popd > /dev/null
;; ;;
...@@ -347,7 +347,7 @@ function op { ...@@ -347,7 +347,7 @@ function op {
fi fi
if [ "$skip" -eq "0" ] if [ "$skip" -eq "0" ]
then then
"${CARGO}" clean "${CARGO[@]}" clean
fi fi
popd > /dev/null popd > /dev/null
;; ;;
...@@ -363,7 +363,7 @@ function op { ...@@ -363,7 +363,7 @@ function op {
fi fi
if [ "$skip" -eq "0" ] if [ "$skip" -eq "0" ]
then then
#TODO "${CARGO}" install --root "$stage" $CARGOFLAGS #TODO "${CARGO[@]}" install --root "$stage" $CARGOFLAGS
if [ "$DEBUG" == 1 ] if [ "$DEBUG" == 1 ]
then then
build=debug build=debug
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment