d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3304ba9d70
freebsd-nq/usr.bin/bmake/Makefile.inc

27 lines
559 B
PHP
Raw Normal View History

Add bmake to the build and allow it to be installed as make(1) instead of FreeBSD's make by setting WITH_BMAKE. The WITH_BMAKE build makes it easy for people to switch while working out the kinks -- think ports tree here. The option will be removed in due time. Submitted by: Simon Gerraty (sjg@juniper.net)
2012-10-06 19:19:21 +00:00
# $FreeBSD$
Fix the upgrade path for fmake by allowing the include of src.opts.mk to fail and falling back on the conservative testing of variables already in place. This should stop the tide of tinderbox mail.
2014-05-06 14:33:18 +00:00
.sinclude <src.opts.mk>
Add bmake to the build and allow it to be installed as make(1) instead of FreeBSD's make by setting WITH_BMAKE. The WITH_BMAKE build makes it easy for people to switch while working out the kinks -- think ports tree here. The option will be removed in due time. Submitted by: Simon Gerraty (sjg@juniper.net)
2012-10-06 19:19:21 +00:00
.if defined(.PARSEDIR)
# make sure this is available to unit-tests/Makefile
.export SRCTOP
.endif
Similar to r266147, don't define PROG in the test subdirs. Magic things happen when including bsd.prog.mk in them. Sponsored by: EMC / Isilon Storage Division
2015-09-23 21:35:58 +00:00
.if exists(${.CURDIR}/tests)
Add bmake to the build and allow it to be installed as make(1) instead of FreeBSD's make by setting WITH_BMAKE. The WITH_BMAKE build makes it easy for people to switch while working out the kinks -- think ports tree here. The option will be removed in due time. Submitted by: Simon Gerraty (sjg@juniper.net)
2012-10-06 19:19:21 +00:00
PROG= make
Similar to r266147, don't define PROG in the test subdirs. Magic things happen when including bsd.prog.mk in them. Sponsored by: EMC / Isilon Storage Division
2015-09-23 21:35:58 +00:00
.endif
Add bmake to the build and allow it to be installed as make(1) instead of FreeBSD's make by setting WITH_BMAKE. The WITH_BMAKE build makes it easy for people to switch while working out the kinks -- think ports tree here. The option will be removed in due time. Submitted by: Simon Gerraty (sjg@juniper.net)
2012-10-06 19:19:21 +00:00
guard against MK_SHARED_TOOLCHAIN not being defined.
2013-05-16 22:35:33 +00:00
.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
Merge bmake-20121111 Also pay attention to MK_SHARED_TOOLCHAIN. Approved by: marcel (mentor)
2012-11-16 01:37:25 +00:00
NO_SHARED?= YES
.endif
Makefile.inc is also included by the tests subdirectory, which results in SUBDIRS having tests added to it, which fails. Work around this by checking to make sure tests exists before adding it to subdirs and work to get the generated file fixed so we can rename Makefile.inc to something else so it isn't automatically included by subdirs...
2014-05-15 15:45:45 +00:00
# hack to not add tests to tests subdir since this is included from
# there and to avoid renaming things that require changes to generated
# files.
.if defined(MK_TESTS) && ${MK_TESTS} != no && exists(${.CURDIR}/tests)
Undo changes to the generated Makefile. Move tests directory to proper location, including updating the test to work in the more-fragile fmake -> bmake bootstrap environment.
2014-05-15 01:27:24 +00:00
SUBDIR+= tests
.endif
Add bmake to the build and allow it to be installed as make(1) instead of FreeBSD's make by setting WITH_BMAKE. The WITH_BMAKE build makes it easy for people to switch while working out the kinks -- think ports tree here. The option will be removed in due time. Submitted by: Simon Gerraty (sjg@juniper.net)
2012-10-06 19:19:21 +00:00
WARNS=3
We really need to get the bsd.own.mk from this tree so the correct options are set. Also defined NO_PWD_OVERRIDE to match behavior of fmake.
2013-05-17 19:37:16 +00:00
CFLAGS+= -DNO_PWD_OVERRIDE
Reference in New Issue Copy Permalink