diff options
author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-08-24 15:38:18 -0400 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-25 00:31:25 +0200 |
commit | 060102389e572abb2beaed3b9f5e1036aeea43f1 (patch) | |
tree | b3bef135bdfb57cefc09c81652224e1e2daab951 | |
parent | fa9af304f0a167f187a26cc9a0a0ba6a4db08cbe (diff) | |
download | ffmpeg-060102389e572abb2beaed3b9f5e1036aeea43f1.tar.gz |
configure: do not fork off grep subprocess in probe_cc
grep is not required for the functionality in this instance.
This avoids an unnecessary fork, and also avoids a duplicated dumpversion call.
Furthermore, it also corrects behavior when no minor version number is present, see e.g
https://github.com/joyent/node/pull/25671.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3566,9 +3566,9 @@ probe_cc(){ gcc_pkg_ver=$(expr "$gcc_version" : '[^ ]* \(([^)]*)\)') gcc_ext_ver=$(expr "$gcc_version" : ".*$gcc_pkg_ver $gcc_basever \\(.*\\)") _ident=$(cleanws "gcc $gcc_basever $gcc_pkg_ver $gcc_ext_ver") - if ! $_cc -dumpversion | grep -q '^2\.'; then - _depflags='-MMD -MF $(@:.o=.d) -MT $@' - fi + case $gcc_basever in + 2*) _depflags='-MMD -MF $(@:.o=.d) -MT $@' ;; + esac _cflags_speed='-O3' _cflags_size='-Os' elif $_cc --version 2>/dev/null | grep -q ^icc; then |