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

Make cargo configurable

parent dbe058a9
No related branches found
No related tags found
No related merge requests found
......@@ -6,6 +6,7 @@ source config.sh
# Variables to be overriden by recipes
export BINDIR=bin
export CARGO=xargo
export CARGOBUILD=rustc
export CARGOFLAGS=
export DEBUG=
......@@ -229,7 +230,7 @@ function op {
fi
if [ "$skip" -eq "0" ]
then
xargo update
"${CARGO}" update
fi
popd > /dev/null
;;
......@@ -312,7 +313,7 @@ function op {
if [ "$skip" -eq "0" ]
then
cp -p "$ROOT/Xargo.toml" "Xargo.toml"
xargo "$CARGOBUILD" --target "$TARGET" $release_flag $CARGOFLAGS
"${CARGO}" "$CARGOBUILD" --target "$TARGET" $release_flag $CARGOFLAGS
fi
popd > /dev/null
;;
......@@ -333,7 +334,7 @@ function op {
if [ "$skip" -eq "0" ]
then
cp -p "$ROOT/Xargo.toml" "Xargo.toml"
xargo test --no-run --target "$TARGET" $release_flag $CARGOFLAGS
"${CARGO}" test --no-run --target "$TARGET" $release_flag $CARGOFLAGS
fi
popd > /dev/null
;;
......@@ -346,7 +347,7 @@ function op {
fi
if [ "$skip" -eq "0" ]
then
xargo clean
"${CARGO}" clean
fi
popd > /dev/null
;;
......@@ -362,7 +363,7 @@ function op {
fi
if [ "$skip" -eq "0" ]
then
#TODO xargo install --root "$stage" $CARGOFLAGS
#TODO "${CARGO}" install --root "$stage" $CARGOFLAGS
if [ "$DEBUG" == 1 ]
then
build=debug
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment