[src/trunk]: src/share/mk Use :U successfully this time. In an expression su...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3417512608d6
branches:  trunk
changeset: 518349:3417512608d6
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 28 20:12:47 2001 +0000

description:
Use :U successfully this time.  In an expression such as ${FOO:D:Ubar}, you
end up with empty string if FOO is defined, and `bar' if it is undefined.

diffstat:

 share/mk/bsd.obj.mk |  7 ++-----
 share/mk/bsd.sys.mk |  7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (42 lines):

diff -r 0e2fa49f59fa -r 3417512608d6 share/mk/bsd.obj.mk
--- a/share/mk/bsd.obj.mk       Wed Nov 28 19:32:07 2001 +0000
+++ b/share/mk/bsd.obj.mk       Wed Nov 28 20:12:47 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.obj.mk,v 1.37 2001/11/27 05:42:24 jmc Exp $
+#      $NetBSD: bsd.obj.mk,v 1.38 2001/11/28 20:12:47 tv Exp $
 
 .if !target(__initialized_obj__)
 __initialized_obj__:
@@ -39,10 +39,7 @@
 __objdir=      obj${OBJMACHINE:D.${MACHINE}}
 
 __usrobjdir=   ${BSDOBJDIR}${USR_OBJMACHINE:D.${MACHINE}}
-__usrobjdirpf=
-.if !defined(USR_OBJMACHINE)
-__usrobjdirpf= ${OBJMACHINE:D.${MACHINE}}
-.endif
+__usrobjdirpf= ${USR_OBJMACHINE:D:U${OBJMACHINE:D.${.MACHINE}}}
 
 .if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ:Uno} != "no")
 # In case .CURDIR has been twiddled by a .mk file and is now relative,
diff -r 0e2fa49f59fa -r 3417512608d6 share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Wed Nov 28 19:32:07 2001 +0000
+++ b/share/mk/bsd.sys.mk       Wed Nov 28 20:12:47 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.65 2001/11/26 06:11:20 jmc Exp $
+#      $NetBSD: bsd.sys.mk,v 1.66 2001/11/28 20:12:47 tv Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -28,10 +28,7 @@
 .endif
 
 CPPFLAGS+=     ${AUDIT:D-D__AUDIT__}
-.if !defined(NOGCCERROR)
-CFLAGS+= -Werror
-.endif
-CFLAGS+=       ${CWARNFLAGS}
+CFLAGS+=       ${CWARNFLAGS} ${NOGCCERROR:D:U-Werror}
 LINTFLAGS+=    ${DESTDIR:D-d ${DESTDIR}/usr/include}
 
 .if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")