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:49:08 +0100 |
| commit | d04e78805aa41b43d371ce9cd9b4fd2bf3af2989 (patch) | |
| tree | 0d1121df20a35c453d4676ae53d46aaefb369558 | |
| parent | 25c67b21653422bbdc9a3689332ad30031289c33 (diff) | |
| download | ffmpeg-d04e78805aa41b43d371ce9cd9b4fd2bf3af2989.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
@@ -2636,7 +2636,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" |