1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Merge commit '0026e356d044e72b6e743b234708b8b8af457ac0'

* commit '0026e356d044e72b6e743b234708b8b8af457ac0':
  configure: Die if gas is unavailable under aarch64 as well as ARM

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-08 21:38:12 +02:00

2
configure vendored
View File

@@ -4363,7 +4363,7 @@ EOF
} }
if enabled asm; then if enabled asm; then
enabled arm aarch64 && nogas=die enabled_any arm aarch64 && nogas=die
enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
if ! check_gas ; then if ! check_gas ; then