[FFmpeg-cvslog] configure: fix clang-cl check in the MSVC section

Hendrik Leppkes git at videolan.org
Thu Apr 19 10:59:04 EEST 2018


ffmpeg | branch: release/4.0 | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Apr 18 16:33:13 2018 +0200| [a73b464118a71483241d3120c05e2b3bd871bb44] | committer: Hendrik Leppkes

configure: fix clang-cl check in the MSVC section

Without properly grouping the checks, the second test would execute for
MSVC cl.exe, which results in configure getting stuck since cl.exe -? is
an interactive paginated help screen, waiting for input.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a73b464118a71483241d3120c05e2b3bd871bb44
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 535a59b737..dee507cb6a 100755
--- a/configure
+++ b/configure
@@ -4411,7 +4411,7 @@ probe_cc(){
         _flags_filter=msvc_flags
         _ld_lib='lib%.a'
         _ld_path='-libpath:'
-    elif $_cc -nologo- 2>&1 | grep -q Microsoft || $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; then
+    elif $_cc -nologo- 2>&1 | grep -q Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then
         _type=msvc
         _ident=$($_cc 2>&1 | head -n1 | tr -d '\r')
         _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'



More information about the ffmpeg-cvslog mailing list