svn commit: r266566 - head/usr.bin/bmake

[Andriy Gapon]

On 23/05/2014 03:20, Warner Losh wrote:
> Author: imp
> Date: Fri May 23 00:20:44 2014
> New Revision: 266566
> URL: http://svnweb.freebsd.org/changeset/base/266566
> 
> Log:
>   Add .../share/mk to the default system make path. This will fix the
>   problem with broken in-tree builds (which are used far more
>   pervasively than I'd known outside the tree). However, weird results
>   may now happen if at any point in the tree above you there happens to
>   be a directory that has subdirectory of share/mk, as unpredictable
>   results will follow. This was considered the lessor of the two evils,
>   at least for now. In the future this will be removed again when the
>   underlying issues are resolved.

Just in case, a concrete example of a possible problem.
If a ports tree is placed somewhere below /usr/local and devel/bmake is
installed then /usr/local/share/mk/sys.mk would be used instead of
/usr/share/mk/sys.mk during port builds.  And the former looks nothing like the
latter.

> Modified:
>   head/usr.bin/bmake/Makefile
> 
> Modified: head/usr.bin/bmake/Makefile
> ==============================================================================
> --- head/usr.bin/bmake/Makefile	Thu May 22 23:38:17 2014	(r266565)
> +++ head/usr.bin/bmake/Makefile	Fri May 23 00:20:44 2014	(r266566)
> @@ -166,7 +166,6 @@ accept test:
>  # override some simple things
>  BINDIR= /usr/bin
>  MANDIR= /usr/share/man/man
> -DEFAULT_SYS_PATH= /usr/share/mk
>  
>  # make sure we get this
>  CFLAGS+= ${COPTS.${.IMPSRC:T}}
> 


-- 
Andriy Gapon