diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index f79dae4..f291f85 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/rav1e.git" -SCRIPT_COMMIT="537b1b91b861210062b1cf105a5bd0243bab0b90" +SCRIPT_COMMIT="db7a71ae53a31a60bf31bd0635f46e15bdcc444c" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 @@ -16,18 +16,38 @@ ffbuild_dockerbuild() { --prefix="$FFBUILD_PREFIX" \ --library-type=staticlib \ --crt-static \ - --release ) + if [[ $TARGET == win_not_yet ]]; then + # CHECKME: back to release once lto is fixed + myconf+=( + --profile release-no-lto + ) + else + myconf+=( + --release + ) + fi + + export CC="${FFBUILD_CROSS_PREFIX}gcc" + export CXX="${FFBUILD_CROSS_PREFIX}g++" + export LD="${FFBUILD_CROSS_PREFIX}gcc" + export AR="${FFBUILD_CROSS_PREFIX}ar" + if [[ -n "$FFBUILD_RUST_TARGET" ]]; then myconf+=( --target="$FFBUILD_RUST_TARGET" ) + cat <$CARGO_HOME/config.toml +[build] +target = "$FFBUILD_RUST_TARGET" +[target.$FFBUILD_RUST_TARGET] +linker = "$LD" +ar = "$AR" +EOF fi - export CC="${FFBUILD_CROSS_PREFIX}gcc" - - cargo cinstall "${myconf[@]}" + cargo cinstall -v "${myconf[@]}" } ffbuild_configure() {