virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-04 05:57:49 +02:00
Code Issues Releases Activity

Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'

Browse Source 
* commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead':
  configure: check $as first before using $gas as GNU as

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-05 19:31:08 +02:00
commit 00d2346885
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -4345,22 +4345,32 @@ if [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] ;then
fi fi
fi fi
check_gas() {
if enabled asm; then log "check_gas using '$as' as AS"
enabled arm && nogas=die # :vararg is used on aarch64, arm and ppc altivec
enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn check_as <<EOF || return 1
as=${gas:=$as} .macro m n, y:vararg=0
check_as <<EOF && enable gnu_as || \ \n: .int \y
$nogas "GNU assembler not found, install gas-preprocessor"
.macro m n
\n: .int 0
.endm .endm
m x m x
EOF EOF
# .altmacro is only used in arm asm
check_as <<EOF || $nogas "GNU assembler not found, install gas-preprocessor" ! enabled arm || check_as <<EOF || return 1
.altmacro .altmacro
EOF EOF
enable gnu_as
return 0
}
if enabled asm; then
enabled arm aarch64 && nogas=die
enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
if ! check_gas ; then
as=${gas:=$as}
check_gas || \
$nogas "GNU assembler not found, install gas-preprocessor"
fi
check_as <<EOF && enable as_func check_as <<EOF && enable as_func
.func test .func test