diff options
author | Zack Weinberg <zack@codesourcery.com> | 2001-10-30 16:47:25 +0000 |
---|---|---|
committer | Zack Weinberg <zack@gcc.gnu.org> | 2001-10-30 16:47:25 +0000 |
commit | 5fed851da8f2306827f83a3edb12e53ad6852fe5 (patch) | |
tree | 116b4b4d3d10a8c7c4c9938ee6c5536a756dca76 | |
parent | cfaef1166fb702b60a885f8d08fde70741473825 (diff) | |
download | gcc-5fed851da8f2306827f83a3edb12e53ad6852fe5.zip gcc-5fed851da8f2306827f83a3edb12e53ad6852fe5.tar.gz gcc-5fed851da8f2306827f83a3edb12e53ad6852fe5.tar.bz2 |
configure.in: Correct previous change...
* configure.in: Correct previous change: don't assume that
gas's version number _isn't_ the last thing on the line, or
isn't the only number on the line, either.
* configure: Regenerate.
From-SVN: r46643
-rw-r--r-- | gcc/ChangeLog | 7 | ||||
-rwxr-xr-x | gcc/configure | 2 | ||||
-rw-r--r-- | gcc/configure.in | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 195d90a..12a84cd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-10-30 Zack Weinberg <zack@codesourcery.com> + + * configure.in: Correct previous change: don't assume that + gas's version number _isn't_ the last thing on the line, or + isn't the only number on the line, either. + * configure: Regenerate. + 2001-10-30 Kazu Hirata <kazu@hxi.com> * cfgcleanup.c: Fix a comment typo. diff --git a/gcc/configure b/gcc/configure index 9ddc44f..5c2141d 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7207,7 +7207,7 @@ EOF # arbitrary sections are supported and try the test. as_ver=`$gcc_cv_as --version 2>/dev/null | head -1` if echo "$as_ver" | grep GNU > /dev/null; then - as_ver=`echo $as_ver | sed -e 's/.* \([0-9.][0-9.]*\) .*/\1/'` + as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'` as_major=`echo $as_ver | sed 's/\..*//'` as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'` if test $as_major -eq 2 -a $as_minor -lt 11; then diff --git a/gcc/configure.in b/gcc/configure.in index 2e32cf1..96518c3 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1383,7 +1383,7 @@ EOF as_ver=`$gcc_cv_as --version 2>/dev/null | head -1` if echo "$as_ver" | grep GNU > /dev/null; then changequote(,)dnl - as_ver=`echo $as_ver | sed -e 's/.* \([0-9.][0-9.]*\) .*/\1/'` + as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'` as_major=`echo $as_ver | sed 's/\..*//'` as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'` changequote([,])dnl |