jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 18:59:37 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
6989c166d6
freebsd-src/usr.bin/bmake/Makefile.inc

33 lines
717 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 20:19:21 +01:00
# $FreeBSD$
.include "bsd.own.mk"
.if defined(.PARSEDIR)
# make sure this is available to unit-tests/Makefile
.export SRCTOP
.endif
Per the comment, we cannot rely on bsd.own.mk we could be on an old system that knows noting of MK_BMAKE or on an almost up to date one that is defaulting it to "no" neither of which will work.
2013-05-17 23:18:27 +01:00
# Sadly, we cannot assume bsd.own.mk did its job,
# nor can we safely include the one we want
.if !defined(WITHOUT_BMAKE)
MK_BMAKE= yes
.endif
Similar to r250719: guard against MK_BMAKE not being defined.
2013-05-16 23:25:17 +01:00
.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
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 20:19:21 +01:00
PROG= make
.endif
guard against MK_SHARED_TOOLCHAIN not being defined.
2013-05-16 23:35:33 +01: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
MFC r266074,r266104,r266147: r266074: Move old fmake tests into bmake and hook them to the build. This first step is mostly to prevent the code from rotting even further and to ensure these do not get wiped when fmake's code is removed from the tree. These tests are currently being skipped because they detect the underlying make is not fmake and thus disable themselves -- and the reason is that some of the tests fail, possibly due to legitimate bugs. Enabling them to run against bmake will come separately. Lastly, it would be ideal if these tests were fed upstream but they are not ready for that yet. In the interim, just put them under usr.bin/bmake/ while we sort things out. The existence of a different unit-tests directory within here makes me feel less guilty about this. Change confirmed working with a clean amd64 build. r266104: 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. r266147: 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-12-30 02:32:48 +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)
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 20:19:21 +01: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 20:37:16 +01:00
CFLAGS+= -DNO_PWD_OVERRIDE
Reference in New Issue Copy Permalink