mirror of
https://github.com/BtbN/FFmpeg-Builds.git
synced 2025-04-29 22:24:28 +02:00
Fix Rust-Cross-Compilation once again
Not sure if semantics changed once again, or why this suddenly broke.
This commit is contained in:
parent
dd430088ca
commit
1dd9a407c7
@ -10,7 +10,7 @@ ffbuild_enabled() {
|
|||||||
|
|
||||||
ffbuild_dockerbuild() {
|
ffbuild_dockerbuild() {
|
||||||
local myconf=(
|
local myconf=(
|
||||||
--prefix="$FFBUILD_PREFIX"
|
--prefix="${FFBUILD_PREFIX}"
|
||||||
--target="${FFBUILD_RUST_TARGET}"
|
--target="${FFBUILD_RUST_TARGET}"
|
||||||
--library-type=staticlib
|
--library-type=staticlib
|
||||||
--crt-static
|
--crt-static
|
||||||
@ -24,6 +24,18 @@ ffbuild_dockerbuild() {
|
|||||||
# The pinned version is broken, and upstream does not react
|
# The pinned version is broken, and upstream does not react
|
||||||
cargo update cc
|
cargo update cc
|
||||||
|
|
||||||
|
export "AR_${FFBUILD_RUST_TARGET//-/_}"="${AR}"
|
||||||
|
export "RANLIB_${FFBUILD_RUST_TARGET//-/_}"="${RANLIB}"
|
||||||
|
export "NM_${FFBUILD_RUST_TARGET//-/_}"="${NM}"
|
||||||
|
export "LD_${FFBUILD_RUST_TARGET//-/_}"="${LD}"
|
||||||
|
export "CC_${FFBUILD_RUST_TARGET//-/_}"="${CC}"
|
||||||
|
export "CXX_${FFBUILD_RUST_TARGET//-/_}"="${CXX}"
|
||||||
|
export "LD_${FFBUILD_RUST_TARGET//-/_}"="${LD}"
|
||||||
|
export "CFLAGS_${FFBUILD_RUST_TARGET//-/_}"="${CFLAGS}"
|
||||||
|
export "CXXFLAGS_${FFBUILD_RUST_TARGET//-/_}"="${CXXFLAGS}"
|
||||||
|
export "LDFLAGS_${FFBUILD_RUST_TARGET//-/_}"="${LDFLAGS}"
|
||||||
|
unset AR RANLIB NM CC CXX LD CFLAGS CXXFLAGS LDFLAGS
|
||||||
|
|
||||||
cargo cinstall -v "${myconf[@]}"
|
cargo cinstall -v "${myconf[@]}"
|
||||||
|
|
||||||
chmod 644 "${FFBUILD_PREFIX}"/lib/*rav1e*
|
chmod 644 "${FFBUILD_PREFIX}"/lib/*rav1e*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user