From c5991e7801cff7440ccb6c4db84ec1129cb8244d Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Sat, 27 Nov 2021 16:09:36 +0300 Subject: [PATCH] don't use thread local on i386 build fails when using Xcode 12.5.1 --- scripts/apple/ffmpeg.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/apple/ffmpeg.sh b/scripts/apple/ffmpeg.sh index 7e57b3a..7b9bfc4 100755 --- a/scripts/apple/ffmpeg.sh +++ b/scripts/apple/ffmpeg.sh @@ -438,7 +438,9 @@ else fi # 3. Use thread local log levels -${SED_INLINE} 's/static int av_log_level/__thread int av_log_level/g' "${BASEDIR}"/src/${LIB_NAME}/libavutil/log.c 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 +if [[ ${ARCH} != i386 ]]; then + ${SED_INLINE} 's/static int av_log_level/__thread int av_log_level/g' "${BASEDIR}"/src/${LIB_NAME}/libavutil/log.c 1>>"${BASEDIR}"/build.log 2>&1 || exit 1 +fi # 4. Set friendly ffmpeg version FFMPEG_VERSION="v$(get_user_friendly_ffmpeg_version)"