commit d62ffc8d7819cccd721999111394af5e0abc42f7 Author: Jacob Panek Date: Sun May 8 21:59:11 2022 +0200 patch out CARGO_HOME and use --frozen diff --git a/build-aux/cargo.sh b/build-aux/cargo.sh index e9b2526..be15616 100755 --- a/build-aux/cargo.sh +++ b/build-aux/cargo.sh @@ -8,21 +8,12 @@ export MESON_BUILD_ROOT="$1" export MESON_SOURCE_ROOT="$2" export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target -export CARGO_HOME="$MESON_BUILD_ROOT"/cargo-home export OUTPUT="$3" export BUILDTYPE="$4" export APP_BIN="$5" -if [ $BUILDTYPE = "release" ] -then - echo "RELEASE MODE" - cargo build --manifest-path \ - "$MESON_SOURCE_ROOT"/Cargo.toml --release && \ - cp "$CARGO_TARGET_DIR"/release/"$APP_BIN" "$OUTPUT" -else - echo "DEBUG MODE" - cargo build --manifest-path \ - "$MESON_SOURCE_ROOT"/Cargo.toml && \ - cp "$CARGO_TARGET_DIR"/debug/"$APP_BIN" "$OUTPUT" -fi +echo "RELEASE MODE" +cargo build --manifest-path \ + "$MESON_SOURCE_ROOT"/Cargo.toml --release --frozen && \ + cp "$CARGO_TARGET_DIR"/release/"$APP_BIN" "$OUTPUT"