ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Mar 31 14:32:32 2017 -0300| [e5177e8f8db009c159e0e3dbaf8c5f8b05258e5b] | committer: James Almer
Merge commit '831005b2302cbeb377e3f00fd18c78928bcec185' * commit '831005b2302cbeb377e3f00fd18c78928bcec185': configure: Log correct test name and use correct filter when testing objective C flags Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5177e8f8db009c159e0e3dbaf8c5f8b05258e5b --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index f3b88b4..e23b211 100755 --- a/configure +++ b/configure @@ -1045,15 +1045,15 @@ EOF } test_objcflags(){ - log test_cflags "$@" - set -- $($cflags_filter "$@") + log test_objcflags "$@" + set -- $($objcflags_filter "$@") check_objcc "$@" <<EOF int x; EOF } check_objcflags(){ - log check_cflags "$@" + log check_objcflags "$@" test_objcflags "$@" && add_objcflags "$@" } ====================================================================== diff --cc configure index f3b88b4,4cfa066..e23b211 --- a/configure +++ b/configure @@@ -1036,17 -883,9 +1036,17 @@@ check_cflags() test_cflags "$@" && add_cflags "$@" } +check_cxxflags(){ + log check_cxxflags "$@" + set -- $($cflags_filter "$@") + check_cxx "$@" <<EOF && append CXXFLAGS "$@" +int x; +EOF +} + test_objcflags(){ - log test_cflags "$@" - set -- $($cflags_filter "$@") + log test_objcflags "$@" + set -- $($objcflags_filter "$@") check_objcc "$@" <<EOF int x; EOF _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
