aboutsummaryrefslogtreecommitdiff
path: root/contrib/bmake/mk/compiler.mk
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/bmake/mk/compiler.mk')
-rw-r--r--contrib/bmake/mk/compiler.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/bmake/mk/compiler.mk b/contrib/bmake/mk/compiler.mk
index 83c0cead8f25..e7a13f0f11d7 100644
--- a/contrib/bmake/mk/compiler.mk
+++ b/contrib/bmake/mk/compiler.mk
@@ -1,4 +1,6 @@
-# $Id: compiler.mk,v 1.10 2021/12/08 05:56:50 sjg Exp $
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# $Id: compiler.mk,v 1.14 2024/02/19 00:05:50 sjg Exp $
#
# @(#) Copyright (c) 2019, Simon J. Gerraty
#
@@ -23,16 +25,16 @@ COMPILER_VERSION = 0
.if empty(COMPILER_TYPE) || empty(COMPILER_VERSION)
# gcc does not always say gcc
_v != (${CC} --version) 2> /dev/null | \
- egrep -i 'clang|cc|[1-9]\.[0-9]|Free Software Foundation'; echo
+ ${EGREP:Uegrep} -i 'clang|cc|[1-9]\.[0-9]|Free Software Foundation'; echo
.if empty(COMPILER_TYPE)
.if ${_v:Mclang} != ""
COMPILER_TYPE = clang
-.elif ${_v:M[Gg][Cc][Cc]} != "" || ${_v:MFoundation*} != "" || ${CC:T:M*gcc*} != ""
+.elif ${_v:M[Gg][Cc][Cc]} != "" || ${_v:MFoundation*} != "" || ${CC:Ucc:T:M*gcc*} != ""
COMPILER_TYPE = gcc
.endif
.endif
.if empty(COMPILER_VERSION)
-COMPILER_VERSION != echo "${_v:M[1-9].[0-9]*}:[1]" | \
+COMPILER_VERSION != echo "${_v:M[1-9][0-9]*.[0-9]*}:[1]" | \
awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}'
.endif
.undef _v