Merge branch 'cargo' into 'master'

cargo: Use the Meson build dir as the Cargo root See merge request GNOME/gnome-tour!49

Merge branch 'cargo' into 'master'
ec530aba · Bilal Elmoussaoui · 181465b1 · dbdd2e06 · ec530aba
Commit ec530aba authored Jul 04, 2021 by Bilal Elmoussaoui
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cargo.sh build-aux/cargo.sh +1 -1

No files found.
--- a/build-aux/cargo.sh
+++ b/build-aux/cargo.sh
@@ -3,7 +3,7 @@
 export MESON_BUILD_ROOT="$1"
 export MESON_SOURCE_ROOT="$2"
 export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target
-export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home
+export CARGO_HOME="$MESON_BUILD_ROOT"/cargo-home
 FEATURES="$6"

 if [ $4 = "Devel" ]