mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '457cc333b424994ecf80a82369325771e0397fd9'
* commit '457cc333b424994ecf80a82369325771e0397fd9': configure: properly support DEC/Compaq compiler Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d28467b62e
|
@ -2389,6 +2389,24 @@ EOF
|
||||||
die "Sanity test failed."
|
die "Sanity test failed."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ccc_flags(){
|
||||||
|
for flag; do
|
||||||
|
case $flag in
|
||||||
|
-std=c99) echo -c99 ;;
|
||||||
|
-mcpu=*) echo -arch ${flag#*=} ;;
|
||||||
|
-mieee) echo -ieee ;;
|
||||||
|
-O*|-fast) echo $flag ;;
|
||||||
|
-fno-math-errno) echo -assume nomath_errno ;;
|
||||||
|
-g) echo -g3 ;;
|
||||||
|
-Wall) echo -msg_enable level2 ;;
|
||||||
|
-Wno-pointer-sign) echo -msg_disable ptrmismatch1 ;;
|
||||||
|
-Wl,*) echo $flag ;;
|
||||||
|
-f*|-W*) ;;
|
||||||
|
*) echo $flag ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
msvc_flags(){
|
msvc_flags(){
|
||||||
for flag; do
|
for flag; do
|
||||||
case $flag in
|
case $flag in
|
||||||
|
@ -2530,10 +2548,9 @@ probe_cc(){
|
||||||
_type=ccc
|
_type=ccc
|
||||||
_ident=$($_cc -V | head -n1 | cut -d' ' -f1-3)
|
_ident=$($_cc -V | head -n1 | cut -d' ' -f1-3)
|
||||||
_DEPFLAGS='-M'
|
_DEPFLAGS='-M'
|
||||||
debuglevel=3
|
|
||||||
_ldflags='-Wl,-z,now' # calls to libots crash without this
|
|
||||||
_cflags_speed='-fast'
|
_cflags_speed='-fast'
|
||||||
_cflags_size='-O1'
|
_cflags_size='-O1'
|
||||||
|
_flags_filter=ccc_flags
|
||||||
elif $_cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then
|
elif $_cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then
|
||||||
test -d "$sysroot" || die "No valid sysroot specified."
|
test -d "$sysroot" || die "No valid sysroot specified."
|
||||||
_type=armcc
|
_type=armcc
|
||||||
|
@ -2886,7 +2903,7 @@ elif enabled arm; then
|
||||||
|
|
||||||
elif enabled alpha; then
|
elif enabled alpha; then
|
||||||
|
|
||||||
enabled ccc && cpuflags="-arch $cpu" || cpuflags="-mcpu=$cpu"
|
cpuflags="-mcpu=$cpu"
|
||||||
|
|
||||||
elif enabled bfin; then
|
elif enabled bfin; then
|
||||||
|
|
||||||
|
@ -3293,6 +3310,10 @@ if enabled_all tms470 glibc; then
|
||||||
add_cflags -pds=48 # incompatible redefinition of macro
|
add_cflags -pds=48 # incompatible redefinition of macro
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if enabled_all ccc glibc; then
|
||||||
|
add_ldflags -Wl,-z,now # calls to libots crash without this
|
||||||
|
fi
|
||||||
|
|
||||||
esc(){
|
esc(){
|
||||||
echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
|
echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
|
||||||
}
|
}
|
||||||
|
@ -3972,12 +3993,10 @@ if enabled icc; then
|
||||||
fi
|
fi
|
||||||
elif enabled ccc; then
|
elif enabled ccc; then
|
||||||
# disable some annoying warnings
|
# disable some annoying warnings
|
||||||
add_cflags -msg_disable cvtu32to64
|
add_cflags -msg_disable bitnotint
|
||||||
add_cflags -msg_disable embedcomment
|
add_cflags -msg_disable mixfuncvoid
|
||||||
add_cflags -msg_disable needconstext
|
add_cflags -msg_disable nonstandcast
|
||||||
add_cflags -msg_disable nomainieee
|
add_cflags -msg_disable unsupieee
|
||||||
add_cflags -msg_disable ptrmismatch1
|
|
||||||
add_cflags -msg_disable unreachcode
|
|
||||||
elif enabled gcc; then
|
elif enabled gcc; then
|
||||||
check_optflags -fno-tree-vectorize
|
check_optflags -fno-tree-vectorize
|
||||||
check_cflags -Werror=implicit-function-declaration
|
check_cflags -Werror=implicit-function-declaration
|
||||||
|
@ -4007,6 +4026,9 @@ elif enabled msvc; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case $target_os in
|
case $target_os in
|
||||||
|
osf1)
|
||||||
|
enabled ccc && add_ldflags '-Wl,-expect_unresolved,*'
|
||||||
|
;;
|
||||||
plan9)
|
plan9)
|
||||||
add_cppflags -Dmain=plan9_main
|
add_cppflags -Dmain=plan9_main
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue