Skip to content

Commit 87479d9

Browse files
authored
Mac M1 build fix
1 parent c71379c commit 87479d9

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

build-ffmpeg

+9-5
Original file line numberDiff line numberDiff line change
@@ -768,11 +768,15 @@ if build "libtheora" "1.1.1"; then
768768
sed "s/-fforce-addr//g" configure >configure.patched
769769
chmod +x configure.patched
770770
mv configure.patched configure
771-
##BEGIN CONFIG.GUESS PATCH -- Updating config.guess file. Which allowed me to compile on aarch64 (ARMv8) [linux kernel 4.9 Ubuntu 20.04]
772-
rm config.guess
773-
curl -L --silent -o "config.guess" "https://raw.githubusercontent.com/gcc-mirror/gcc/master/config.guess"
774-
chmod +x config.guess
775-
##END OF CONFIG.GUESS PATCH
771+
772+
if ! $MACOS_M1; then
773+
##BEGIN CONFIG.GUESS PATCH -- Updating config.guess file. Which allowed me to compile on aarch64 (ARMv8) [linux kernel 4.9 Ubuntu 20.04]
774+
rm config.guess
775+
curl -L --silent -o "config.guess" "https://raw.githubusercontent.com/gcc-mirror/gcc/master/config.guess"
776+
chmod +x config.guess
777+
##END OF CONFIG.GUESS PATCH
778+
fi
779+
776780
execute ./configure --prefix="${WORKSPACE}" --with-ogg-libraries="${WORKSPACE}"/lib --with-ogg-includes="${WORKSPACE}"/include/ --with-vorbis-libraries="${WORKSPACE}"/lib --with-vorbis-includes="${WORKSPACE}"/include/ --enable-static --disable-shared --disable-oggtest --disable-vorbistest --disable-examples --disable-asm --disable-spec
777781
execute make -j $MJOBS
778782
execute make install

0 commit comments

Comments
 (0)