11 files changed, 27 insertions, 32 deletions
diff --git a/mk/sys/AIX.mk b/mk/sys/AIX.mk
index 895b92f17cc3..a5c49584fe2c 100644
--- a/mk/sys/AIX.mk
+++ b/mk/sys/AIX.mk
@@ -72,8 +72,6 @@ PFLAGS=
 COMPILE.p=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p=		${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL=		sh
-
 YACC=		yacc
 YFLAGS=		-d
 YACC.y=		${YACC} ${YFLAGS}
diff --git a/mk/sys/Darwin.mk b/mk/sys/Darwin.mk
index c6beb72aeb27..6d37127be13f 100644
--- a/mk/sys/Darwin.mk
+++ b/mk/sys/Darwin.mk
@@ -4,7 +4,7 @@
 OS=		Darwin
 unix?=		We run ${OS}.
 
-.SUFFIXES: .out .a .ln .o .s .S .c ${CXX_SUFFIXES} .F .f .r .y .l .cl .p .h
+.SUFFIXES: .out .a .ln .o .s .S .c .m ${CXX_SUFFIXES} .F .f .r .y .l .cl .p .h
 .SUFFIXES: .sh .m4 .dylib
 
 .LIBS:		.a .dylib
@@ -24,10 +24,15 @@ LINK.s?=	${CC} ${AFLAGS} ${LDFLAGS}
 COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-.if exists(/usr/bin/gcc)
-CC?=		gcc -pipe
+PIPE?=		-pipe
+
+.if exists(/usr/bin/clang)
+CC?=		cc ${PIPE}
+CXX?=		c++
+.elif exists(/usr/bin/gcc)
+CC?=		gcc ${PIPE}
 .else
-CC?=		cc -pipe
+CC?=		cc ${PIPE}
 .endif
 DBG?=		-O2
 CFLAGS?=	${DBG}
@@ -52,7 +57,7 @@ CPP?=		cpp
 NOLINT=		1
 CPPFLAGS?=
 
-MK_DEP?=	mkdeps.sh -N
+MK_DEP?=	mkdep
 
 FC?=		f77
 FFLAGS?=	-O
@@ -91,8 +96,6 @@ PFLAGS?=
 COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL?=		sh
-
 SIZE?=		size
 
 TSORT?=		tsort -q
@@ -121,6 +124,16 @@ ${CXX_SUFFIXES:%=%.a}:
 	${AR} ${ARFLAGS} $@ $*.o
 	rm -f $*.o
 
+# Objective-C
+.m:
+	${LINK.m} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.m.o:
+	${COMPILE.m} ${.IMPSRC}
+.m.a:
+	${COMPILE.m} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
 # Fortran/Ratfor
 .f:
 	${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
diff --git a/mk/sys/Generic.mk b/mk/sys/Generic.mk
index 9e3e6a7bc760..aa92a6246411 100644
--- a/mk/sys/Generic.mk
+++ b/mk/sys/Generic.mk
@@ -1,4 +1,4 @@
-#	$Id: Generic.mk,v 1.13 2017/05/05 18:02:16 sjg Exp $
+#	$Id: Generic.mk,v 1.14 2020/04/17 21:08:17 sjg Exp $
 #
 
 # some reasonable defaults
@@ -87,8 +87,6 @@ PFLAGS?=
 COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL?=		sh
-
 SIZE?=		size
 
 YACC?=		yacc
diff --git a/mk/sys/HP-UX.mk b/mk/sys/HP-UX.mk
index 29157b9f336c..ac5ce37b85fc 100644
--- a/mk/sys/HP-UX.mk
+++ b/mk/sys/HP-UX.mk
@@ -1,4 +1,4 @@
-#	$Id: HP-UX.mk,v 1.11 2017/05/05 18:02:16 sjg Exp $
+#	$Id: HP-UX.mk,v 1.12 2020/04/17 21:08:17 sjg Exp $
 #	$NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
@@ -108,7 +108,7 @@ LINK.p=		${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 # HP's sh sucks
 ENV=
-SHELL=		/bin/ksh
+MAKE_SHELL=		/bin/ksh
 
 .if exists(/usr/local/bin/bison)
 YACC=		bison -y
diff --git a/mk/sys/IRIX.mk b/mk/sys/IRIX.mk
index 3d2236b084e3..b448fb5720cf 100644
--- a/mk/sys/IRIX.mk
+++ b/mk/sys/IRIX.mk
@@ -77,8 +77,6 @@ PFLAGS?=
 COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL?=		sh
-
 SIZE?=		size
 
 TSORT?= 	tsort -q
diff --git a/mk/sys/Linux.mk b/mk/sys/Linux.mk
index 090de3ae2e2f..978aec098ca3 100644
--- a/mk/sys/Linux.mk
+++ b/mk/sys/Linux.mk
@@ -1,4 +1,4 @@
-#	$Id: Linux.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $
+#	$Id: Linux.mk,v 1.10 2020/04/17 21:08:17 sjg Exp $
 #	$NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
@@ -75,8 +75,6 @@ PFLAGS=
 COMPILE.p=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p=		${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL=		sh
-
 YACC=		yacc
 YFLAGS=		-d
 YACC.y=		${YACC} ${YFLAGS}
diff --git a/mk/sys/NetBSD.mk b/mk/sys/NetBSD.mk
index 00ea9a6ed445..a1711a5ec9db 100644
--- a/mk/sys/NetBSD.mk
+++ b/mk/sys/NetBSD.mk
@@ -112,8 +112,6 @@ PFLAGS?=
 COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL?=		sh
-
 SIZE?=		size
 
 TSORT?= 	tsort -q
diff --git a/mk/sys/OSF1.mk b/mk/sys/OSF1.mk
index 1b4515a6fee0..0d0a73f40c98 100644
--- a/mk/sys/OSF1.mk
+++ b/mk/sys/OSF1.mk
@@ -1,4 +1,4 @@
-#	$Id: OSF1.mk,v 1.8 2017/05/05 18:02:16 sjg Exp $
+#	$Id: OSF1.mk,v 1.9 2020/04/17 21:08:17 sjg Exp $
 #	$NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
@@ -82,8 +82,6 @@ PFLAGS=
 COMPILE.p=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p=		${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL=		sh
-
 .if exists(/usr/local/bin/bison) || exists(/opt/gnu/bin/bison)
 YACC=		bison -y
 .else
diff --git a/mk/sys/OpenBSD.mk b/mk/sys/OpenBSD.mk
index a570c1cb9b8c..8b87ef3e85a4 100644
--- a/mk/sys/OpenBSD.mk
+++ b/mk/sys/OpenBSD.mk
@@ -87,8 +87,6 @@ PFLAGS?=
 COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL?=		sh
-
 SIZE?=		size
 
 TSORT?= 	tsort -q
diff --git a/mk/sys/SunOS.mk b/mk/sys/SunOS.mk
index 2fb5128ab7d8..71c985204fc6 100644
--- a/mk/sys/SunOS.mk
+++ b/mk/sys/SunOS.mk
@@ -1,4 +1,4 @@
-#	$Id: SunOS.mk,v 1.8 2017/05/05 18:02:17 sjg Exp $
+#	$Id: SunOS.mk,v 1.9 2020/04/17 21:08:17 sjg Exp $
 
 .if ${.PARSEFILE} == "sys.mk"
 .include <host-target.mk>
@@ -103,8 +103,6 @@ PFLAGS=
 COMPILE.p=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p=		${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL=		sh
-
 .if exists(/usr/local/bin/bison) || exists(/opt/gnu/bin/bison)
 YACC=		bison -y
 .else
diff --git a/mk/sys/UnixWare.mk b/mk/sys/UnixWare.mk
index d65ca01fa2a7..3b1e531515df 100644
--- a/mk/sys/UnixWare.mk
+++ b/mk/sys/UnixWare.mk
@@ -1,4 +1,4 @@
-#	$Id: UnixWare.mk,v 1.3 2017/05/05 18:02:17 sjg Exp $
+#	$Id: UnixWare.mk,v 1.4 2020/04/17 21:08:17 sjg Exp $
 #	based on "Id: SunOS.5.sys.mk,v 1.6 2003/09/30 16:42:23 sjg Exp "
 #	$NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
@@ -121,8 +121,6 @@ PFLAGS?=
 COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-SHELL?=		sh
-
 SIZE?=		size
 
 TSORT?=		tsort