aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-02-13 13:17:46 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-02-14 23:58:20 +0100
commit48e05567390ca98b3cfe0dec171e28f458765698 (patch)
tree7845d8d0ec01723f1956726914a67a9ddcbb41e6
parent8429368d22e3dc046b1ec0311c292e0e70ee1a9d (diff)
downloadffmpeg-48e05567390ca98b3cfe0dec171e28f458765698.tar.gz
configure: report full gcc version string
This makes the cc_ident value, which is used in FATE reports, include all interesting parts of the gcc version string. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 5d57846bba7010dc6ee65c3503dd06600e5441a5)
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 238bf0142b..7b9c5a4952 100755
--- a/configure
+++ b/configure
@@ -1866,8 +1866,11 @@ if $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
elif $cc -v 2>&1 | grep -qi ^gcc; then
cc_type=gcc
cc_version=__VERSION__
- gcc_extra_ver=$(expr "$($cc --version | head -n1)" : '.*\((.*)\)')
- cc_ident="gcc $($cc -dumpversion) $gcc_extra_ver"
+ gcc_version=$($cc --version | head -n1)
+ gcc_basever=$($cc -dumpversion)
+ gcc_pkg_ver=$(expr "$gcc_version" : '^[^ ]* \(([^)]*)\)')
+ gcc_ext_ver=$(expr "$gcc_version" : ".*$gcc_pkg_ver $gcc_basever \\(.*\\)")
+ cc_ident=$(cleanws "gcc $gcc_basever $gcc_pkg_ver $gcc_ext_ver")
if ! $cc -dumpversion | grep -q '^2\.'; then
CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'