1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '5691c746cf62e69806aae1baf0a6e8252d519444'

* commit '5691c746cf62e69806aae1baf0a6e8252d519444':
  configure: Group toolchain parameter mangling functions together

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-09-02 17:33:30 -03:00
commit 9a88a47be4

44
configure vendored
View File

@ -955,12 +955,32 @@ test_stat(){
stat "$1" >> $logfile 2>&1
}
cc_e(){
eval printf '%s\\n' $CC_E
}
cc_o(){
eval printf '%s\\n' $CC_O
}
cc_e(){
eval printf '%s\\n' $CC_E
as_o(){
eval printf '%s\\n' $AS_O
}
x86asm_o(){
eval printf '%s\\n' $X86ASM_O
}
ld_o(){
eval printf '%s\\n' $LD_O
}
hostcc_e(){
eval printf '%s\\n' $HOSTCC_E
}
hostcc_o(){
eval printf '%s\\n' $HOSTCC_O
}
test_cc(){
@ -991,10 +1011,6 @@ test_cpp(){
test_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC
}
as_o(){
eval printf '%s\\n' $AS_O
}
test_as(){
log test_as "$@"
cat > $TMPS
@ -1002,10 +1018,6 @@ test_as(){
test_cmd $as $CPPFLAGS $ASFLAGS "$@" $AS_C $(as_o $TMPO) $TMPS
}
x86asm_o(){
eval printf '%s\\n' $X86ASM_O
}
test_x86asm(){
log test_x86asm "$@"
echo "$1" > $TMPASM
@ -1077,10 +1089,6 @@ check_x86asm(){
test_x86asm "$@" && enable $name
}
ld_o(){
eval printf '%s\\n' $LD_O
}
test_ld(){
log test_ld "$@"
type=$1
@ -1513,14 +1521,6 @@ require_pkg_config(){
check_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message"
}
hostcc_e(){
eval printf '%s\\n' $HOSTCC_E
}
hostcc_o(){
eval printf '%s\\n' $HOSTCC_O
}
test_host_cc(){
log test_host_cc "$@"
cat > $TMPC