summaryrefslogtreecommitdiffstats
path: root/usr.bin/make/Makefile
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2011-11-30 18:07:38 +0000
committerfjoe <fjoe@FreeBSD.org>2011-11-30 18:07:38 +0000
commit6f481b1357f44382da85a9659995c4360955127f (patch)
tree734d17693f7a92edb7b855396b9ca4601d2f2f0c /usr.bin/make/Makefile
parentd326d5565d29f6c883c23618b8168e3a18585cfe (diff)
downloadFreeBSD-src-6f481b1357f44382da85a9659995c4360955127f.zip
FreeBSD-src-6f481b1357f44382da85a9659995c4360955127f.tar.gz
- Fix segmentation fault when running "+command" when run with -jX -n due
to Compat_RunCommand() being called with `cmd' that is not on the node->commands list - Make ellipsis ("..." command) handling consistent: check for "..." command in job make after variables expansion to match compat make behavior - Fix empty command handling (after variables expansion and @+- modifiers are processed): now empty commands are ignored in compat make and are not printed in job make case - Bump MAKE_VERSION to 5-2011-11-30-0
Diffstat (limited to 'usr.bin/make/Makefile')
-rw-r--r--usr.bin/make/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index c581385..2dc7e583 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -10,7 +10,9 @@ SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
NO_SHARED?= YES
-CFLAGS+=-DMAKE_VERSION=\"5200408120\"
+# Version has the RYYYYMMDDX format, where R is from RELENG_<R>
+CFLAGS+=-DMAKE_VERSION=\"5201111300\"
+
# There is no obvious performance improvement currently.
# CFLAGS+=-DUSE_KQUEUE
OpenPOWER on IntegriCloud