Merge pull request #6104 from jameshilliard/target-host-env

rust: cleaner rust target-applies-to-host fix
This commit is contained in:
CvH 2022-01-23 15:02:33 +01:00 committed by GitHub
commit b725090127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 3 deletions

View File

@ -51,8 +51,8 @@ if [ "${HOSTTYPE}" = "${TARGET_ARCH}" ]; then
# by the cross compiler. Read more here. # by the cross compiler. Read more here.
# https://doc.rust-lang.org/cargo/reference/unstable.html#target-applies-to-host # 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_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_TARGET_APPLIES_TO_HOST="false"
export CARGO_Z_TARGET_APPLIES_TO_HOST="-Z target-applies-to-host"
fi fi
export PATH="${CARGO_HOME}/bin:${PATH}" export PATH="${CARGO_HOME}/bin:${PATH}"
export PKG_CONFIG_ALLOW_CROSS="1" export PKG_CONFIG_ALLOW_CROSS="1"

View File

@ -14,7 +14,6 @@ PKG_TOOLCHAIN="manual"
make_target() { make_target() {
. "$(get_build_dir rust)/cargo/env" . "$(get_build_dir rust)/cargo/env"
cargo build \ cargo build \
${CARGO_Z_TARGET_APPLIES_TO_HOST} \
--release \ --release \
--locked \ --locked \
--all-features --all-features

View File

@ -25,7 +25,6 @@ PKG_MAINTAINER="Anton Voyl (awiouy)"
make_target() { make_target() {
. $(get_build_dir rust)/cargo/env . $(get_build_dir rust)/cargo/env
cargo build \ cargo build \
${CARGO_Z_TARGET_APPLIES_TO_HOST} \
--release \ --release \
--no-default-features \ --no-default-features \
--features "alsa-backend pulseaudio-backend with-dns-sd" --features "alsa-backend pulseaudio-backend with-dns-sd"