Mercurial > hg > icedtea8-forest

changeset 2200:644bdc77dd18 icedtea-3.7.0 icedtea-3.8.0pre00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3526: configure fails to parse GCC version Summary: Use -dumpversion to get version directly rather than hacking it out of -version.
author andrew
date Wed, 14 Feb 2018 04:23:39 +0000
parents bb6c98b95968
children dbc9a7fc6492
files common/autoconf/generated-configure.sh common/autoconf/toolchain.m4
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Tue Feb 06 18:20:50 2018 +0000
+++ b/common/autoconf/generated-configure.sh	Wed Feb 14 04:23:39 2018 +0000
@@ -3999,7 +3999,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1501170108
+DATE_WHEN_GENERATED=1518582174
 
 ###############################################################################
 #
@@ -20169,8 +20169,7 @@
 
     # First line typically looks something like:
     # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
-        $SED -e 's/^.* \([1-9]\.[0-9.]*\)[^0-9.].*$/\1/'`
+    COMPILER_VERSION=`$COMPILER -dumpversion`
     COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) [1-9][0-9.]*/\1/p"`
   fi
   # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
@@ -21350,8 +21349,7 @@
 
     # First line typically looks something like:
     # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
-        $SED -e 's/^.* \([1-9]\.[0-9.]*\)[^0-9.].*$/\1/'`
+    COMPILER_VERSION=`$COMPILER -dumpversion`
     COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) [1-9][0-9.]*/\1/p"`
   fi
   # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
--- a/common/autoconf/toolchain.m4	Tue Feb 06 18:20:50 2018 +0000
+++ b/common/autoconf/toolchain.m4	Wed Feb 14 04:23:39 2018 +0000
@@ -138,8 +138,7 @@
 
     # First line typically looks something like:
     # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
-    COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
-        $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
+    COMPILER_VERSION=`$COMPILER -dumpversion`
     COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) @<:@1-9@:>@@<:@0-9.@:>@*/\1/p"`
   fi
   # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)