Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2018-04-18 17:33:13 +0300
committerHendrik Leppkes <h.leppkes@gmail.com>2018-04-19 10:58:48 +0300
commita73b464118a71483241d3120c05e2b3bd871bb44 (patch)
treef94d0efb0646cdace0ed947fd2bc80092c285e78 /configure
parentd9e9e97e5f477f6cb42d916f41b436d269cb71c8 (diff)
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.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
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)'