Date: Thu, 15 May 2014 09:34:36 -0400 From: Warner Losh <imp@bsdimp.com> To: Julio Merino <jmmv@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org>, Warner Losh <imp@FreeBSD.org> Subject: Re: svn commit: r266104 - head/usr.bin/bmake Message-ID: <D774FF1A-4735-41E6-93C1-CD22DC5A2F97@bsdimp.com> In-Reply-To: <538F0E8D-DF1A-4593-BF82-7AC9307EAA3E@freebsd.org> References: <201405150127.s4F1RPxK072767@svn.freebsd.org> <538F0E8D-DF1A-4593-BF82-7AC9307EAA3E@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On May 15, 2014, at 9:31 AM, Julio Merino <jmmv@freebsd.org> wrote: > On May 14, 2014, at 21:27, Warner Losh <imp@FreeBSD.org> wrote: > >> Author: imp >> Date: Thu May 15 01:27:24 2014 >> New Revision: 266104 >> URL: http://svnweb.freebsd.org/changeset/base/266104 >> >> Log: >> 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. >> >> Modified: >> head/usr.bin/bmake/Makefile >> head/usr.bin/bmake/Makefile.inc > [...] >> Modified: head/usr.bin/bmake/Makefile.inc >> ============================================================================== >> --- head/usr.bin/bmake/Makefile.inc Thu May 15 01:06:27 2014 (r266103) >> +++ head/usr.bin/bmake/Makefile.inc Thu May 15 01:27:24 2014 (r266104) >> @@ -13,5 +13,9 @@ PROG= make >> NO_SHARED?= YES >> .endif >> >> +.if defined(MK_TESTS) && ${MK_TESTS} != no >> +SUBDIR+= tests >> +.endif >> + > > Ugh, and this broke the build when MK_TESTS=yes. The problem is that tests/Makefile transparently includes ../Makefile.inc, which defines SUBDIR+=tests (as above)... and this is obviously invalid within the tests subdirectory. > > What's your suggestion to fix this? I can think of renaming Makefile.inc to something different to ensure that the subdirectories don't spuriously include it. That may be the best solution, but I’d like a little time to think about it… The other option is to toss an && exists(${.CURDIR}/tests) on the end as well... Warner [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJTdMJsAAoJEGwc0Sh9sBEAALsP/0xd2s8l3N8ZutHrHCuP5Txj pkv5XEkE2kQC7//zWkYibQid00h69SIWVA6Kc/9kp0Zh8KyqkC2Bs9XWhxKgMUtB bx3dlf1A8Q0eqVvn+bnHcaNcjoPbrk8wXr/XeA8+zBLCV2C3MFblPSbEC/nl6T5F r+iFGoq1fVvnBmekdIBAT+cBDesuXkA/1/JAm03m0D4s+6zYmAOC+UlsUF0dnhNJ LMdXBCWIvuJ/96xowE2EczRVtavoPsMnmLSfpFst3QUUnt3lcTHQ+NbLcFNZ+WvX p3/JLraBnqXbZdwvtlSArThHknxFFKV79Nxy2ss58xMXLUIAUiaMFmDxflB7kynU s4Tbp6BUi2BCC+fbHd4i4MMjAxhvTI7LaHK7NhDBgwTyhQvJOFShqFgpoPUQL0e5 Pz5NAvsOGgcZ6FrurydI76XiuzFZbBiN10t/67JJ1d3+txB9LU/xAmKbHTFPMBsj wRnaSIT1MskYvQEkadujlEcXynRqrBsRh41HARv4uMjz976k7BKbCmz1W7CeDn5O zy49AD59Alj+BELnsSY96rH1oaHaKcfBtEE8DV0+vSm2oX/4YuLPhk0EiSA1YhJy 1YfgrtQyrxEz8V3ZscTZb4rEtlDDIsmfrFnFoU0JZdL4P0F/Zz3UOKZJTVO32/Wu BF/rTZfPGzOjlsQ1frZe =lQmV -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D774FF1A-4735-41E6-93C1-CD22DC5A2F97>