svn commit: r357661 - head/share/mk

[Dimitry Andric]

Author: dim
Date: Fri Feb  7 19:04:27 2020
New Revision: 357661
URL: https://svnweb.freebsd.org/changeset/base/357661

Log:
  Correctly recognize linker versions greater than 10.0.
  
  MFC after:	3 days

Modified:
  head/share/mk/bsd.linker.mk

Modified: head/share/mk/bsd.linker.mk
==============================================================================
--- head/share/mk/bsd.linker.mk	Fri Feb  7 19:00:43 2020	(r357660)
+++ head/share/mk/bsd.linker.mk	Fri Feb  7 19:04:27 2020	(r357661)
@@ -65,7 +65,7 @@ _ld_version!=	(${${ld}} --version || echo none) | sed 
 .if ${_ld_version:[1..2]} == "GNU ld"
 ${X_}LINKER_TYPE=	bfd
 ${X_}LINKER_FREEBSD_VERSION=	0
-_v=	${_ld_version:M[1-9].[0-9]*:[1]}
+_v=	${_ld_version:M[1-9]*.[0-9]*:[1]}
 .elif ${_ld_version:[1]} == "LLD"
 ${X_}LINKER_TYPE=	lld
 _v=	${_ld_version:[2]}
@@ -77,7 +77,7 @@ ${X_}LINKER_FREEBSD_VERSION!= \
 ${X_}LINKER_TYPE=	bfd
 _v=	2.17.50
 .endif
-${X_}LINKER_VERSION!=	echo "${_v:M[1-9].[0-9]*}" | \
+${X_}LINKER_VERSION!=	echo "${_v:M[1-9]*.[0-9]*}" | \
 			  awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
 .undef _ld_version
 .undef _v