svn commit: r358076 - in stable: 11/share/mk 12/share/mk

[Dimitry Andric]

Author: dim
Date: Tue Feb 18 18:03:04 2020
New Revision: 358076
URL: https://svnweb.freebsd.org/changeset/base/358076

Log:
  MFC r357661:
  
  Correctly recognize linker versions greater than 10.0.

Modified:
  stable/12/share/mk/bsd.linker.mk
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/share/mk/bsd.linker.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/share/mk/bsd.linker.mk
==============================================================================
--- stable/12/share/mk/bsd.linker.mk	Tue Feb 18 17:59:37 2020	(r358075)
+++ stable/12/share/mk/bsd.linker.mk	Tue Feb 18 18:03:04 2020	(r358076)
@@ -59,7 +59,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]}
@@ -71,7 +71,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