From: mhorne <mhorne@FreeBSD.org>
Date: Sun, 8 Sep 2019 19:40:52 +0000 (+0000)
Subject: Allow for compiler versions >= 10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1828e1c98f69d9e882e3cab0ec4e49f1d08831e0;p=freebsd.git

Allow for compiler versions >= 10

Both clang and gcc development branches have reached version 10. Since we
only parse for a single digit in the major version number, this causes
COMPILER_VERSION to be set to its default of 0.0.0, meaning version checks
fail with these newer compilers.

Reviewed by:	emaste
Approved by:	markj (mentor)
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D21413
---

diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
index 70f08bc8a9d..0cf6f1749e3 100644
--- a/share/mk/bsd.compiler.mk
+++ b/share/mk/bsd.compiler.mk
@@ -187,7 +187,7 @@ ${X_}COMPILER_TYPE:=	clang
 . endif
 .endif
 .if !defined(${X_}COMPILER_VERSION)
-${X_}COMPILER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
+${X_}COMPILER_VERSION!=echo "${_v:M[1-9]*.[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
 .endif
 .undef _v
 .endif