diff options
| author | Warner Losh <imp@FreeBSD.org> | 2015-10-06 04:18:48 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2015-10-06 04:18:48 +0000 |
| commit | b946bedd09d3bd121608ca4d22564670879391a0 (patch) | |
| tree | 6e7a7cedfe9b4b5f38538cc56538757ef2219285 /share | |
| parent | d029a42ab4ae1572d8550b54c95a98017c414e2b (diff) | |
| download | src-b946bedd09d3bd121608ca4d22564670879391a0.tar.gz src-b946bedd09d3bd121608ca4d22564670879391a0.zip | |
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
Notes
Notes:
svn path=/head/; revision=288911
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.own.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index a0ced5357cb9..2f20da8620be 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 <bsd.compiler.mk> +.endif # !_WITHOUT_SRCCONF .endif # !target(__<bsd.own.mk>__) |