d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
220,989 Commits 6 Branches 133 Tags 2.6 GiB
d625788dbc
Commit Graph

15 Commits

Author SHA1 Message Date
Bryan Drewery
2254894222 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
Warner Losh
0629d5e958 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
Warner Losh
a3438dfc9b 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
Warner Losh
f0e845794d 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
Stefan Eßer
cb3d295629 Revert r265436, since it is not the correct fix. 2014-05-06 14:01:48 +00:00
Stefan Eßer
05071052ab Fix include statement to accept src.opts.mk from a source directory 
instead of from /usr/share/mk.

I'm not sure that this will let buildworld complete on a system with
no installed src.opts.mk (make buildworld is still running), but the
tinderbox builds are all failing earlyon without this patch.
 2014-05-06 12:31:17 +00:00
Warner Losh
d03127447d Remove support for WITHOUT_BMAKE. bmake is now the only make that can 
build world, so it is the only make we build or install. fmake is
still in the tree, but disconnected, and upgrades from older systems
that still have bmake has not been removed, but its state has not been
tested (it should work given how minimal the work to upgrade to bmake
is).
 2014-05-06 04:22:37 +00:00
Warner Losh
c6063d0da8 Use src.opts.mk in preference to bsd.own.mk except where we need stuff 
from the latter.
 2014-05-06 04:22:01 +00:00
Simon J. Gerraty
3c1c0edeef 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 22:18:27 +00:00
Simon J. Gerraty
8ebb983529 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
Xin LI
f26784139f guard against MK_SHARED_TOOLCHAIN not being defined. 2013-05-16 22:35:33 +00:00
Xin LI
ac2c0328ca Similar to r250719: guard against MK_BMAKE not being defined. 2013-05-16 22:25:17 +00:00
Simon J. Gerraty
59a02420d8 Merge bmake-20121111 
Also pay attention to MK_SHARED_TOOLCHAIN.

Approved by:	marcel (mentor)
 2012-11-16 01:37:25 +00:00
David E. O'Brien
22ddf6d447 Obey the value of "MK_BMAKE". 2012-10-16 15:43:16 +00:00
Marcel Moolenaar
d4d90f10bc 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