Page MenuHomeFreeBSD
Files F151029040

D55872.id.diff
No OneTemporary
Actions

D55872.id.diff
View Options

diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile
--- a/lib/libc/tests/gen/Makefile
+++ b/lib/libc/tests/gen/Makefile
@@ -1,4 +1,5 @@
.include <bsd.own.mk>
+.include <bsd.compiler.mk>
ATF_TESTS_C+= arc4random_test
ATF_TESTS_C+= dir2_test
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -1,4 +1,5 @@
.include <bsd.own.mk>
+.include <bsd.compiler.mk>
MK_WERROR= no
WARNS?= 2
diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile
--- a/lib/libc/tests/stdio/Makefile
+++ b/lib/libc/tests/stdio/Makefile
@@ -1,4 +1,5 @@
.include <bsd.own.mk>
+.include <bsd.compiler.mk>
ATF_TESTS_C+= eintr_test
ATF_TESTS_C+= fdopen_test
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -291,10 +291,4 @@
DEPENDFILE?= .depend
-# Compat for the moment -- old bsd.own.mk only included this when _WITHOUT_SRCCONF
-# wasn't defined. bsd.ports.mk and friends depend on this behavior. Remove in 12.
-.if !defined(_WITHOUT_SRCCONF)
-.include <bsd.compiler.mk>
-.endif # !_WITHOUT_SRCCONF
-
.endif # !target(__<bsd.own.mk>__)
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,3 +1,5 @@
+.include <bsd.compiler.mk>
+
SYSDIR?=${SRCTOP}/sys
.include "${SYSDIR}/conf/kern.opts.mk"

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 6, 1:19 PM (8 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30916910
Default Alt Text
D55872.id.diff (1 KB)

Event Timeline