Date: Thu, 15 May 2014 09:31:04 -0400 From: Julio Merino <jmmv@freebsd.org> To: Warner Losh <imp@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r266104 - head/usr.bin/bmake Message-ID: <538F0E8D-DF1A-4593-BF82-7AC9307EAA3E@freebsd.org> In-Reply-To: <201405150127.s4F1RPxK072767@svn.freebsd.org> References: <201405150127.s4F1RPxK072767@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 >=20 > 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. >=20 > Modified: > head/usr.bin/bmake/Makefile > head/usr.bin/bmake/Makefile.inc [...] > Modified: head/usr.bin/bmake/Makefile.inc > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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=3D make > NO_SHARED?=3D YES > .endif >=20 > +.if defined(MK_TESTS) && ${MK_TESTS} !=3D no > +SUBDIR+=3D tests > +.endif > + Ugh, and this broke the build when MK_TESTS=3Dyes. The problem is that = tests/Makefile transparently includes ../Makefile.inc, which defines = SUBDIR+=3Dtests (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.=09=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?538F0E8D-DF1A-4593-BF82-7AC9307EAA3E>