aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2013-11-08 23:55:06 +0100
committerClément Bœsch <u@pkh.me>2013-11-09 12:38:12 +0100
commitdbb41f93c16cbc65a899a75723c95da51c851cd5 (patch)
tree0a745e43803c03d73bad4b2d31b97a1e3b1595f4
parenteb7f7b797f0ae76a7cf6db7792365998ee6e9cba (diff)
downloadffmpeg-dbb41f93c16cbc65a899a75723c95da51c851cd5.tar.gz
build: avoid stdin stall with GNU AS probing.
a758c5e added probing for various tools, such as AS. Unfortunately, GNU AS is reading stdin with -v, and thus configure is stalled with configure arguments such as --as=as. Fixes Ticket #1898.
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 72abb0d227..5f80764552 100755
--- a/configure
+++ b/configure
@@ -2889,7 +2889,9 @@ probe_cc(){
unset _depflags _DEPCMD _DEPFLAGS
_flags_filter=echo
- if $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
+ if $_cc --version 2>&1 | grep -q '^GNU assembler'; then
+ true # no-op to avoid reading stdin in following checks
+ elif $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
_type=llvm_gcc
gcc_extra_ver=$(expr "$($_cc --version | head -n1)" : '.*\((.*)\)')
_ident="llvm-gcc $($_cc -dumpversion) $gcc_extra_ver"