levogevo/ffmpeg-builder
1
0
Fork 0
mirror of https://github.com/levogevo/ffmpeg-builder.git synced 2026-01-15 19:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

update rustc 1.88->1.90

Browse Source
This commit is contained in:
Levon Gevorgyan
2025-12-17 19:01:11 -06:00
parent 687a8473b5
commit 5c9e97e0a2
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/build.sh
View File

@@ -88,13 +88,14 @@ set_compile_opts() {
if ! is_darwin; then if ! is_darwin; then
USE_LD=lld USE_LD=lld
LDFLAGS_ARR+=("-fuse-ld=${USE_LD}") LDFLAGS_ARR+=("-fuse-ld=${USE_LD}")
CMAKE_FLAGS+=( # android does not like LINKER_TYPE despite only using lld
"-DCMAKE_LINKER_TYPE=${USE_LD^^}" if ! is_android; then
"-DCMAKE_LINKER=${USE_LD}" CMAKE_FLAGS+=("-DCMAKE_LINKER_TYPE=${USE_LD^^}")
) fi
CMAKE_FLAGS+=("-DCMAKE_LINKER=${USE_LD}")
local compilerDir="${LOCAL_PREFIX}/compiler-tools" local compilerDir="${LOCAL_PREFIX}/compiler-tools"
test -d "${compilerDir}" && rm -rf "${compilerDir}" test -d "${compilerDir}" && rm -rf "${compilerDir}"
mkdir "${compilerDir}" mkdir -p "${compilerDir}"
# real:gnu:clang:generic # real:gnu:clang:generic
local compilerMap="\ local compilerMap="\
${CC}:gcc:clang:cc ${CC}:gcc:clang:cc
@@ -115,7 +116,7 @@ ld.lld:ld:lld:ld"
echo \$@ > ${compilerDir}/${genericT}.\${RANDOM} echo \$@ > ${compilerDir}/${genericT}.\${RANDOM}
exec \"${realT}\" ${addFlag} \"\$@\"" >"${compilerDir}/${genericT}" exec \"${realT}\" ${addFlag} \"\$@\"" >"${compilerDir}/${genericT}"
chmod +x "${compilerDir}/${genericT}" chmod +x "${compilerDir}/${genericT}"
echo_if_fail "${compilerDir}/${genericT}" --version echo_if_fail "${compilerDir}/${genericT}" --version || return 1
# copy generic to gnu/clang variants # copy generic to gnu/clang variants
# cp "${compilerDir}/${genericT}" "${compilerDir}/${gnuT}" 2>/dev/null # cp "${compilerDir}/${genericT}" "${compilerDir}/${gnuT}" 2>/dev/null
@@ -794,7 +795,8 @@ build_cmake3() {
overrideFlags+=("${flag}") overrideFlags+=("${flag}")
fi fi
done done
CMAKE_FLAGS='' meta_cmake_build \ CMAKE_FLAGS='' CFLAGS='' CXXFLAGS='' LDFLAGS='' \
meta_cmake_build \
"${overrideFlags[@]}" || return 1 "${overrideFlags[@]}" || return 1
} }

2
lib/docker.sh
View File

@@ -161,7 +161,7 @@ docker_build_image() {
echo "RUN pipx install virtualenv" echo "RUN pipx install virtualenv"
# rust # rust
local rustupVersion='1.28.2' local rustupVersion='1.28.2'
local rustcVersion='1.88.0' local rustcVersion='1.90.0'
local rustupTarball="rustup-${rustupVersion}.tar.gz" local rustupTarball="rustup-${rustupVersion}.tar.gz"
local rustupTarballPath="${DOCKER_DIR}/${rustupTarball}" local rustupTarballPath="${DOCKER_DIR}/${rustupTarball}"
if [[ ! -f ${rustupTarballPath} ]]; then if [[ ! -f ${rustupTarballPath} ]]; then