diff options
| author | Clément Bœsch <u@pkh.me> | 2013-11-08 23:55:06 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-11-18 14:26:18 +0100 |
| commit | c38af02626fbaadb815389bf5bbc6d54ab30e470 (patch) | |
| tree | 3f6c8146ac688c1d6b979e0da25b9e78299faf06 | |
| parent | 7ce0f4ea3b206a4f7ce0ceae8751e096b1ebbc9b (diff) | |
| download | ffmpeg-c38af02626fbaadb815389bf5bbc6d54ab30e470.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.
(cherry picked from commit dbb41f93c16cbc65a899a75723c95da51c851cd5)
| -rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -2878,7 +2878,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" |