diff options
author | sjg <sjg@FreeBSD.org> | 2012-11-16 01:37:25 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2012-11-16 01:37:25 +0000 |
commit | d281294411049c9ca9fad03441663d96ccb73476 (patch) | |
tree | f309932499193bc9bb630ead5d6aeb07eeb582a8 /usr.bin/bmake | |
parent | 48176b8f78106dce8ff54e657c3116365c3506d8 (diff) | |
parent | b9451e8e2e7c949c7a89c32cfed6b2399aef0115 (diff) | |
download | FreeBSD-src-d281294411049c9ca9fad03441663d96ccb73476.zip FreeBSD-src-d281294411049c9ca9fad03441663d96ccb73476.tar.gz |
Merge bmake-20121111
Also pay attention to MK_SHARED_TOOLCHAIN.
Approved by: marcel (mentor)
Diffstat (limited to 'usr.bin/bmake')
-rw-r--r-- | usr.bin/bmake/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/bmake/Makefile.inc | 4 | ||||
-rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 44ce56f..7ae5e5f 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -13,7 +13,7 @@ CFLAGS+= -I${.CURDIR} # $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $ # @(#)Makefile 5.2 (Berkeley) 12/28/90 -# $Id: Makefile.in,v 1.174 2012/10/10 18:46:24 sjg Exp $ +# $Id: Makefile.in,v 1.178 2012/11/15 16:48:59 sjg Exp $ PROG?= ${.CURDIR:T} SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \ @@ -33,7 +33,7 @@ srcdir= ${SRCTOP}/contrib/bmake CC?= gcc # Base version on src date -MAKE_VERSION= 20121010 +MAKE_VERSION= 20121111 DEFAULT_SYS_PATH = .../share/mk:/usr/share/mk CPPFLAGS+= diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 4b126c7..c8ca110 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -11,4 +11,8 @@ PROG= make .endif +.if ${MK_SHARED_TOOLCHAIN} == "no" +NO_SHARED?= YES +.endif + WARNS=3 diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index c22dbc5..89c7fe0 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.38 2012/06/19 23:38:48 sjg Exp $ +# $Id: Makefile.in,v 1.39 2012/11/09 19:16:10 sjg Exp $ # -# $NetBSD: Makefile,v 1.34 2012/06/19 23:25:53 sjg Exp $ +# $NetBSD: Makefile,v 1.35 2012/11/09 19:08:28 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -47,6 +47,7 @@ SUBFILES= \ modorder \ modts \ modword \ + order \ phony-end \ posix \ qequals \ @@ -59,6 +60,7 @@ SUBFILES= \ all: ${SUBFILES} flags.doterror= +flags.order=-j1 # the tests are actually done with sub-makes. .PHONY: ${SUBFILES} |