From b946bedd09d3bd121608ca4d22564670879391a0 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 6 Oct 2015 04:18:48 +0000 Subject: [PATCH] Previous versions of bsd.own.mk included bsd.compiler.mk only when _WITHOUT_SRCCONF wasn't defined. Restore this behavior because bsd.ports.mk depends on this in subtle ways. The compat include of bsd.compiler.mk should be removed in 12 anyway. PR: 203540 --- share/mk/bsd.own.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index a0ced5357cb..2f20da8620b 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -246,7 +246,10 @@ XZ_CMD?= xz # overriden by Makefiles, but the user may choose to set this in src.conf(5). TESTSBASE?= /usr/tests -# Compat for the moment +# 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 +.endif # !_WITHOUT_SRCCONF .endif # !target(____)