mk: single mk fragment for new libc

	. allow commands to use it by setting NEED_NBSDLIBC
	. also add mkfiles to clean and cleandepend so they
	  don't break on missing new mkfiles

diff --git a/Makefile b/Makefile
index 1871be377400843882ba6de3e230cd3c78e7780e..7256106accb630394bd8fc2dff96e5473f724882 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ install:
        $(MAKE) -C share install
        $(MAKE) -C tools install
 
-clean:
+clean: mkfiles
        $(MAKE) -C boot clean
        $(MAKE) -C commands clean
        $(MAKE) -C bin clean
@@ -103,7 +103,7 @@ clean:
        $(MAKE) -C lib clean_all
        $(MAKE) -C test clean
 
-cleandepend:
+cleandepend: mkfiles
        $(MAKE) -C lib cleandepend_all
        $(MAKE) -C boot cleandepend
        $(MAKE) -C commands cleandepend

diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 744f304bb4bef039a996f6ecf173855cbcc57f99..e8bdba632f05ab3ffe884c1f217ebd0af6648b63 100644 (file)
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,7 +1,4 @@
-# Requires NBSD_LIBC and clang/gcc (we default to using clang)
-NBSD_LIBC:= yes
-CC:=${CC:C/^cc/clang/}
-COMPILER_TYPE:= gnu
+.include <minix.newlibc.mk>
 
 CPPFLAGS+= -D_NETBSD_SOURCE
 

diff --git a/commands/Makefile.inc b/commands/Makefile.inc
index f927292cc403c0ac729d4d86bc8feb2725a683b3..adbe8e78741f11af23237022110edfc9e29ff50d 100644 (file)
--- a/commands/Makefile.inc
+++ b/commands/Makefile.inc
@@ -1,3 +1,9 @@
+# Any of the commands can force the new libc being used by 
+# setting NEED_NBSDLIBC
+.if defined(NEED_NBSDLIBC)
+.include <minix.newlibc.mk>
+.endif
+
 .if (${NBSD_LIBC} != "no")
 CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE -D_MINIX_COMPAT
 LDADD+= -lminlib -lcompat_minix -lasyn -lterminfo

diff --git a/share/mk/Makefile b/share/mk/Makefile
index a670a384526eef8fc88dd44b342608da3aeef51f..72868ff6a09f79bc693ab7fb05e8a9d94b9930fd 100644 (file)
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -12,7 +12,8 @@ FILES=        bsd.dep.mk bsd.files.mk \
 
 # MINIX-specific files
 FILES+= minix.bootprog.mk minix.service.mk minix.ackdep.mk \
-       minix.ack.mk minix.gcc.mk minix.gcov.mk pkgsrchooks.mk
+       minix.ack.mk minix.gcc.mk minix.gcov.mk pkgsrchooks.mk \
+       minix.newlibc.mk
 
 FILESDIR=/usr/share/mk
 .endif

diff --git a/share/mk/minix.newlibc.mk b/share/mk/minix.newlibc.mk
new file mode 100644 (file)
index 0000000..a102b6f
--- /dev/null
+++ b/share/mk/minix.newlibc.mk
@@ -0,0 +1,5 @@
+# Force clang/gcc and using new libc
+# Requires NBSD_LIBC and clang/gcc (we default to using clang)
+NBSD_LIBC:= yes
+CC:=${CC:C/^cc/clang/}
+COMPILER_TYPE:= gnu

diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc
index 7c252331e9126d1d1f7a7a2c18e034a505f78aa4..708a7b3268c2d8c3d7cb47f3d99ed74109e15176 100644 (file)
--- a/usr.bin/Makefile.inc
+++ b/usr.bin/Makefile.inc
@@ -1,6 +1,4 @@
-# Requires clang/gcc for NetBSD libc
-CC:=${CC:C/^cc/clang/}
-COMPILER_TYPE:= gnu
+.include <minix.newlibc.mk>
 
 CPPFLAGS+= -D_NETBSD_SOURCE -D__NBSD_LIBC=1