diff options
| author | hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-11 00:52:26 +0000 |
|---|---|---|
| committer | hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-11 00:52:26 +0000 |
| commit | 06c2a8a3d3b9fd1643c50f8d975617594effb1da (patch) | |
| tree | caab9a75374f7e11793ed8f8ccf2951b10f99ca8 /gcc/configure.ac | |
| parent | 6a0e1363c5840c73e7dd1480ef08969cf2b63221 (diff) | |
| download | ppe42-gcc-06c2a8a3d3b9fd1643c50f8d975617594effb1da.tar.gz ppe42-gcc-06c2a8a3d3b9fd1643c50f8d975617594effb1da.zip | |
* acinclude.m4 (_gcc_COMPUTE_GAS_VERSION): Allow a single
character to quote the VERSION= contents. Sanity-check contents.
* configure.ac ("what linker to use" ld version extraction): Ditto.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192342 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure.ac')
| -rw-r--r-- | gcc/configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/configure.ac b/gcc/configure.ac index 6ad6d19c9ed..6f307536914 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2049,11 +2049,17 @@ if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext \ for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in do changequote(,)dnl - gcc_cv_gld_version=`sed -n -e 's/^[ ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f` + gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f` if test x$gcc_cv_gld_version != x; then break fi done + case $gcc_cv_gld_version in + VERSION=[0-9]*) ;; +changequote([,])dnl + *) AC_MSG_ERROR([[cannot find version of in-tree linker]]) ;; +changequote(,)dnl + esac gcc_cv_gld_major_version=`expr "$gcc_cv_gld_version" : "VERSION=\([0-9]*\)"` gcc_cv_gld_minor_version=`expr "$gcc_cv_gld_version" : "VERSION=[0-9]*\.\([0-9]*\)"` changequote([,])dnl |
