From 3aa797cb3ad4e832b9b6ba3f4dd6380c09ce660f Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 2 Nov 2018 10:20:12 +0100
Subject: [PATCH] build-style cargo: move cargo config from wrksrc to home

since cargo 0.31.0 ${wrksrc}/.cargo/config is ignored for cargo install
fixes: https://github.com/void-linux/void-packages/issues/4328
---
 common/build-style/cargo.sh             | 10 +++++-----
 common/environment/build-style/cargo.sh |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 4f4809be8b..417e5a53bb 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -3,12 +3,11 @@
 #
 
 do_configure() {
-	mkdir -p .cargo
+	mkdir -p ${HOME}/.cargo
 	# respect makejobs, do cross stuff
-	cat > .cargo/config <<EOF
+	cat > ${HOME}/.cargo/config <<EOF
 [build]
 jobs = ${makejobs#*j}
-target = "${RUST_TARGET}"
 
 [target.${RUST_TARGET}]
 linker = "${CC}"
@@ -18,7 +17,7 @@ EOF
 do_build() {
 	: ${make_cmd:=cargo}
 
-	${make_cmd} build --release ${configure_args}
+	${make_cmd} build --release --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
@@ -30,6 +29,7 @@ do_check() {
 do_install() {
 	: ${make_cmd:=cargo}
 
-	${make_cmd} install --root="${DESTDIR}/usr" ${make_install_args}
+	${make_cmd} install --path . --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
+		${make_install_args}
 	rm "${DESTDIR}"/usr/.crates.toml
 }
diff --git a/common/environment/build-style/cargo.sh b/common/environment/build-style/cargo.sh
index 1ba8d9fada..b311a72446 100644
--- a/common/environment/build-style/cargo.sh
+++ b/common/environment/build-style/cargo.sh
@@ -4,7 +4,4 @@ if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"
 fi
 
-# Use the config we set in do_configure
-export CARGO_HOME="$wrksrc/.cargo"
-
 export PKG_CONFIG_ALLOW_CROSS=1