From 323acc56c2a345553c864df17e31507d7dca2d11 Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Sun, 9 Jan 2022 01:54:26 -0700
Subject: [PATCH] rust: cleaner rust target-applies-to-host fix

Looks like we can set this without passing a command line option.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 packages/addons/addon-depends/librespot-depends/rust/package.mk | 2 +-
 .../addons/addon-depends/system-tools-depends/bottom/package.mk | 1 -
 packages/addons/service/librespot/package.mk                    | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/addons/addon-depends/librespot-depends/rust/package.mk b/packages/addons/addon-depends/librespot-depends/rust/package.mk
index 0b020a3624..ddb393f062 100644
--- a/packages/addons/addon-depends/librespot-depends/rust/package.mk
+++ b/packages/addons/addon-depends/librespot-depends/rust/package.mk
@@ -51,8 +51,8 @@ if [ "${HOSTTYPE}" = "${TARGET_ARCH}" ]; then
   # by the cross compiler. Read more here.
   # https://doc.rust-lang.org/cargo/reference/unstable.html#target-applies-to-host
   export __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly"
+  export CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true"
   export CARGO_TARGET_APPLIES_TO_HOST="false"
-  export CARGO_Z_TARGET_APPLIES_TO_HOST="-Z target-applies-to-host"
 fi
 export PATH="${CARGO_HOME}/bin:${PATH}"
 export PKG_CONFIG_ALLOW_CROSS="1"
diff --git a/packages/addons/addon-depends/system-tools-depends/bottom/package.mk b/packages/addons/addon-depends/system-tools-depends/bottom/package.mk
index 170750c8d6..1c0c1a804f 100644
--- a/packages/addons/addon-depends/system-tools-depends/bottom/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/bottom/package.mk
@@ -14,7 +14,6 @@ PKG_TOOLCHAIN="manual"
 make_target() {
   . "$(get_build_dir rust)/cargo/env"
   cargo build \
-    ${CARGO_Z_TARGET_APPLIES_TO_HOST} \
     --release \
     --locked \
     --all-features
diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk
index 18846bdb52..21cdd15594 100644
--- a/packages/addons/service/librespot/package.mk
+++ b/packages/addons/service/librespot/package.mk
@@ -25,7 +25,6 @@ PKG_MAINTAINER="Anton Voyl (awiouy)"
 make_target() {
   . $(get_build_dir rust)/cargo/env
   cargo build \
-    ${CARGO_Z_TARGET_APPLIES_TO_HOST} \
     --release \
     --no-default-features \
     --features "alsa-backend pulseaudio-backend with-dns-sd"