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
This commit is contained in:
+4
-1
@@ -246,7 +246,10 @@ XZ_CMD?= xz
|
|||||||
# overriden by Makefiles, but the user may choose to set this in src.conf(5).
|
# overriden by Makefiles, but the user may choose to set this in src.conf(5).
|
||||||
TESTSBASE?= /usr/tests
|
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 <bsd.compiler.mk>
|
.include <bsd.compiler.mk>
|
||||||
|
.endif # !_WITHOUT_SRCCONF
|
||||||
|
|
||||||
.endif # !target(__<bsd.own.mk>__)
|
.endif # !target(__<bsd.own.mk>__)
|
||||||
|
|||||||
Reference in New Issue
Block a user