Date: Tue, 21 Oct 2014 20:29:43 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273417 - head Message-ID: <201410212029.s9LKThT2074337@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Oct 21 20:29:42 2014 New Revision: 273417 URL: https://svnweb.freebsd.org/changeset/base/273417 Log: You aren't allowed to test WITH_xxx or WITHOUT_xxx here, so remove it. Even if you were allowed to test for it, the test makes no sense as it always results in adding -DWITH_ATF unless WITH_ATF was already defined. But if MK_ATF != no, then we know it was defined. This, in turn, caused tools/build/options/makemake always think WITH_ATF is the default, which removed control of that from sys.conf.mk. To get the intent of the deleted comment, another mechanism is required, assuming that the intent of that comment is desirable. Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Oct 21 20:21:27 2014 (r273416) +++ head/Makefile.inc1 Tue Oct 21 20:29:42 2014 (r273417) @@ -1561,12 +1561,7 @@ gnu/lib/libsupc++__L: gnu/lib/libstdc++_ lib/libgeom__L: lib/libexpat__L -.if defined(WITH_ATF) || ${MK_TESTS} != "no" -.if !defined(WITH_ATF) -# Ensure that the ATF libraries will be built during make libraries, even -# though they will have WITHOUT_TESTS -MAKE+= -DWITH_ATF -.endif +.if ${MK_TESTS} != "no" _lib_atf= lib/atf .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410212029.s9LKThT2074337>