diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-10-06 16:25:13 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-10-06 16:25:13 +0000 |
| commit | 88750be440bb7a8f75380a78ed43399057725abb (patch) | |
| tree | 2b819b069c310c07245d9ea901cc11eb895f0aba /share | |
| parent | 926b24f30940f8d9cdbe9a94d3445f2b6dd72d72 (diff) | |
| parent | 1a52c1053049f232ee59544168cad948275b68bb (diff) | |
| download | src-88750be440bb7a8f75380a78ed43399057725abb.tar.gz src-88750be440bb7a8f75380a78ed43399057725abb.zip | |
Merge ^/head r288836 through r288925.
Notes
Notes:
svn path=/projects/clang370-import/; revision=288926
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>__) |