diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-10 22:03:59 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-10 22:03:59 +0000 |
| commit | bc53a56c01080bcfa62c2433c36de981d18eb977 (patch) | |
| tree | 55e17b1e670746d9e5a85e6f1585f57a143fe34e /usr.bin/bmake | |
| parent | 2c4686751c3442d00e8ca8a4684be7de7901df5a (diff) | |
| parent | 168edd726ad8a54339e142aec8bee10c893b7326 (diff) | |
| download | FreeBSD-src-bc53a56c01080bcfa62c2433c36de981d18eb977.zip FreeBSD-src-bc53a56c01080bcfa62c2433c36de981d18eb977.tar.gz | |
Merge bmake-20150505 improve detection of malformed conditionals.
Diffstat (limited to 'usr.bin/bmake')
| -rw-r--r-- | usr.bin/bmake/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 93a1d7d..4abb45fe 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -14,10 +14,10 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.36 2015/04/18 19:58:53 sjg Exp $ +# $Id: Makefile,v 1.38 2015/05/05 21:58:05 sjg Exp $ # Base version on src date -MAKE_VERSION= 20150418 +MAKE_VERSION= 20150505 PROG?= ${.CURDIR:T} diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index ee35dda..100b467 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -5,9 +5,9 @@ SRCTOP?= ${.CURDIR:H:H:H} -# $Id: Makefile.in,v 1.46 2014/11/06 01:47:57 sjg Exp $ +# $Id: Makefile.in,v 1.47 2015/05/05 21:58:06 sjg Exp $ # -# $NetBSD: Makefile,v 1.51 2014/10/20 23:21:11 sjg Exp $ +# $NetBSD: Makefile,v 1.52 2015/05/05 21:51:09 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -34,6 +34,7 @@ UNIT_TESTS:= ${srcdir} TESTNAMES= \ comment \ cond1 \ + cond2 \ error \ export \ export-all \ |
