Commit b0cfb663 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

can't trust the compiler exit status, check for messages instead

Originally committed as revision 5869 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a70c27e8
...@@ -213,12 +213,16 @@ add_extralibs(){ ...@@ -213,12 +213,16 @@ add_extralibs(){
append extralibs "$@" append extralibs "$@"
} }
check_cmd(){
"$@" 2>&1 | tee -a $logfile | { ! grep -q .; }
}
check_cc(){ check_cc(){
log check_cc "$@" log check_cc "$@"
cat >$TMPC cat >$TMPC
log_file $TMPC log_file $TMPC
log $cc $CFLAGS "$@" -c -o $TMPO $TMPC log $cc $CFLAGS "$@" -c -o $TMPO $TMPC
$cc $CFLAGS "$@" -c -o $TMPO $TMPC >>$logfile 2>&1 check_cmd $cc $CFLAGS "$@" -c -o $TMPO $TMPC
} }
check_cpp(){ check_cpp(){
...@@ -226,14 +230,14 @@ check_cpp(){ ...@@ -226,14 +230,14 @@ check_cpp(){
cat >$TMPC cat >$TMPC
log_file $TMPC log_file $TMPC
log $cc $CFLAGS "$@" -E -o $TMPO $TMPC log $cc $CFLAGS "$@" -E -o $TMPO $TMPC
$cc $CFLAGS "$@" -E -o $TMPO $TMPC >>$logfile 2>&1 check_cmd $cc $CFLAGS "$@" -E -o $TMPO $TMPC
} }
check_ld(){ check_ld(){
log check_ld "$@" log check_ld "$@"
check_cc || return check_cc || return
log $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs log $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs
$cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs >>$logfile 2>&1 check_cmd $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs
} }
check_cflags(){ check_cflags(){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment