summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-12-14 21:33:31 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-12-14 21:33:31 +0000
commite16d0d1c5c739514efddd779d35435eacf9ca25e (patch)
treee69bf4d53c3cacb6fdcec7781b8e049dd52b350e /usr.bin
parent1fbf1f22f1185738584c0d52e87c510c8ac33901 (diff)
downloadFreeBSD-src-e16d0d1c5c739514efddd779d35435eacf9ca25e.zip
FreeBSD-src-e16d0d1c5c739514efddd779d35435eacf9ca25e.tar.gz
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
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/bmake/Makefile1
1 files changed, 0 insertions, 1 deletions
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}}
OpenPOWER on IntegriCloud