From 93185f399548a454de09e3998708797d384c9a09 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 19 Apr 2019 19:59:06 -0600
Subject: [PATCH] Make cargo configurable
---
cook.sh | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/cook.sh b/cook.sh
index 07936d1bf..65bd49b29 100755
--- a/cook.sh
+++ b/cook.sh
@@ -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
--
GitLab