diff options
| author | Peter Bergner <bergner@linux.ibm.com> | 2019-10-24 19:17:39 +0000 |
|---|---|---|
| committer | Peter Bergner <bergner@linux.ibm.com> | 2019-10-24 19:17:39 +0000 |
| commit | b3875f87fbe002ad43f35ba5cc16efc80f809883 (patch) | |
| tree | ecb74be9e46fcebac6dcaa2e911693b9b70891bf /gcc/configure | |
| parent | d3f50b70a40ea3518d7e386300c4e26e19924ad5 (diff) | |
| parent | d844b1d496ef9602a263834327aa73f72663cb6b (diff) | |
Merge up to 277354.
* REVISION: Update subversion id.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ibm/gcc-8-branch@277422 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gcc/configure b/gcc/configure index 6121e163259..6d2f088c266 100755 --- a/gcc/configure +++ b/gcc/configure @@ -22799,17 +22799,13 @@ if test $in_tree_ld != yes ; then # # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1701:onnv-ab196087-6931056-03/25/10 # - # In Solaris 11.4, this was changed to - # - # ld: Solaris ELF Utilities: 11.4-1.3123 - # # ld and ld.so.1 are guaranteed to be updated in lockstep, so ld version # numbers can be used in ld.so.1 feature checks even if a different # linker is configured. ld_ver=`$gcc_cv_ld -V 2>&1` - if echo "$ld_ver" | $EGREP 'Solaris Link Editors|Solaris ELF Utilities' > /dev/null; then + if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then ld_vers=`echo $ld_ver | sed -n \ - -e 's,^.*: \(5\|1[0-9]\)\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\2,p'` + -e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'` ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'` ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'` fi |