diff options
| author | imp <imp@FreeBSD.org> | 2014-10-21 20:29:42 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-10-21 20:29:42 +0000 |
| commit | 7b65001d2aa521bc274f53faee2bd5353244f3dd (patch) | |
| tree | 08ecdc31010dec8febe19ead9c6819bbec427721 /Makefile.inc1 | |
| parent | 100236adc107eaeaa35c77a31da111cfc67ece64 (diff) | |
| download | FreeBSD-src-7b65001d2aa521bc274f53faee2bd5353244f3dd.zip FreeBSD-src-7b65001d2aa521bc274f53faee2bd5353244f3dd.tar.gz | |
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.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 7899d9d..92679ba 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1561,12 +1561,7 @@ gnu/lib/libsupc++__L: gnu/lib/libstdc++__L 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 |
