From 7bb917633037b8b0b8d0982de8f44ce6530a9d48 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 12 Sep 2022 22:46:28 +0200 Subject: [PATCH] Fix rust build some more --- scripts.d/50-rav1e.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 5f03384..2904264 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -30,18 +30,14 @@ ffbuild_dockerbuild() { fi if [[ -n "$FFBUILD_RUST_TARGET" ]]; then - if [[ $TARGET == win* ]]; then - unset PKG_CONFIG_LIBDIR - fi + unset PKG_CONFIG_LIBDIR myconf+=( --target="$FFBUILD_RUST_TARGET" ) cat <$CARGO_HOME/config.toml -[build] -target = "$FFBUILD_RUST_TARGET" [target.$FFBUILD_RUST_TARGET] -linker = "${FFBUILD_CROSS_PREFIX}ld" +linker = "${FFBUILD_CROSS_PREFIX}gcc" ar = "${FFBUILD_CROSS_PREFIX}ar" EOF fi