From e16d0d1c5c739514efddd779d35435eacf9ca25e Mon Sep 17 00:00:00 2001 From: bdrewery Date: Mon, 14 Dec 2015 21:33:31 +0000 Subject: MFC r266566: 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. For MFCing, this is to ensure that when upgrading to head the share/mk in-tree is always used. Otherwise several build features will not work. This passes a build using head's bmake which has this as the default already. Relnotes: yes --- usr.bin/bmake/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'usr.bin/bmake/Makefile') diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index c91c09a..82decdb 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -167,7 +167,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}} -- cgit v1.1