Date: Fri, 17 May 2013 19:37:16 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250750 - in head: contrib/bmake usr.bin/bmake Message-ID: <201305171937.r4HJbGgP090181@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Fri May 17 19:37:16 2013 New Revision: 250750 URL: http://svnweb.freebsd.org/changeset/base/250750 Log: 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. Modified: head/contrib/bmake/main.c head/usr.bin/bmake/Makefile.inc Modified: head/contrib/bmake/main.c ============================================================================== --- head/contrib/bmake/main.c Fri May 17 19:13:31 2013 (r250749) +++ head/contrib/bmake/main.c Fri May 17 19:37:16 2013 (r250750) @@ -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; Modified: head/usr.bin/bmake/Makefile.inc ============================================================================== --- head/usr.bin/bmake/Makefile.inc Fri May 17 19:13:31 2013 (r250749) +++ head/usr.bin/bmake/Makefile.inc Fri May 17 19:37:16 2013 (r250750) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305171937.r4HJbGgP090181>