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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
