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

simplify command logging

Originally committed as revision 5925 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f5c85943
...@@ -214,6 +214,7 @@ add_extralibs(){ ...@@ -214,6 +214,7 @@ add_extralibs(){
} }
check_cmd(){ check_cmd(){
log "$@"
"$@" >>$logfile 2>&1 "$@" >>$logfile 2>&1
} }
...@@ -221,7 +222,6 @@ check_cc(){ ...@@ -221,7 +222,6 @@ 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
check_cmd $cc $CFLAGS "$@" -c -o $TMPO $TMPC check_cmd $cc $CFLAGS "$@" -c -o $TMPO $TMPC
} }
...@@ -229,14 +229,12 @@ check_cpp(){ ...@@ -229,14 +229,12 @@ check_cpp(){
log check_cpp "$@" log check_cpp "$@"
cat >$TMPC cat >$TMPC
log_file $TMPC log_file $TMPC
log $cc $CFLAGS "$@" -E -o $TMPO $TMPC
check_cmd $cc $CFLAGS "$@" -E -o $TMPO $TMPC 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
check_cmd $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs check_cmd $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs
} }
......
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