diff options
| author | sjg <sjg@FreeBSD.org> | 2013-05-17 19:37:16 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-05-17 19:37:16 +0000 |
| commit | 155b65a40f1f92ffbc2385313f8d4abd1f8d57d3 (patch) | |
| tree | 31795aae9313ad27428d807d124c35a341b1e82c | |
| parent | c519844bb9454e15fd95b2f0cb9e9839aac5bc9c (diff) | |
| download | FreeBSD-src-155b65a40f1f92ffbc2385313f8d4abd1f8d57d3.zip FreeBSD-src-155b65a40f1f92ffbc2385313f8d4abd1f8d57d3.tar.gz | |
We really need to get the bsd.own.mk from this tree so the
correct options are set.
Also defined NO_PWD_OVERRIDE to match behavior of fmake.
| -rw-r--r-- | contrib/bmake/main.c | 5 | ||||
| -rw-r--r-- | usr.bin/bmake/Makefile.inc | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/contrib/bmake/main.c b/contrib/bmake/main.c index 84c6935..0f15f11 100644 --- a/contrib/bmake/main.c +++ b/contrib/bmake/main.c @@ -796,7 +796,10 @@ main(int argc, char **argv) Lst targs; /* target nodes to create -- passed to Make_Init */ Boolean outOfDate = FALSE; /* FALSE if all targets up to date */ struct stat sb, sa; - char *p1, *path, *pwd; + char *p1, *path; +#ifndef NO_PWD_OVERRIDE + char *pwd; +#endif char mdpath[MAXPATHLEN]; #ifdef FORCE_MACHINE const char *machine = FORCE_MACHINE; diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index b6d5ad8..7b5f545 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -1,5 +1,12 @@ # $FreeBSD$ +# we need the up to date bsd.own.mk +.if ${.CURDIR:M*make} == "" +.sinclude "share/mk/bsd.own.mk" +.else +.sinclude "../../share/mk/bsd.own.mk" +.endif +# the above should have found it... .include "bsd.own.mk" .if defined(.PARSEDIR) @@ -16,3 +23,4 @@ NO_SHARED?= YES .endif WARNS=3 +CFLAGS+= -DNO_PWD_OVERRIDE |
