Module Name: src Committed By: christos Date: Sat Apr 16 21:41:25 UTC 2011
Modified Files: src/share/mk: bsd.own.mk Log Message: Simplify and correct (previous did not work for !defined(DESTDIR) To generate a diff of this commit: cvs rdiff -u -r1.656 -r1.657 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.656 src/share/mk/bsd.own.mk:1.657 --- src/share/mk/bsd.own.mk:1.656 Fri Apr 15 14:05:45 2011 +++ src/share/mk/bsd.own.mk Sat Apr 16 17:41:24 2011 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.656 2011/04/15 18:05:45 elric Exp $ +# $NetBSD: bsd.own.mk,v 1.657 2011/04/16 21:41:24 christos Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -207,8 +207,10 @@ OBJC= false .endif -CPPFLAGS+= ${!defined(HOSTPROG) && !defined(HOSTLIB) && defined(DESTDIR) :? --sysroot=${DESTDIR} :} -LDFLAGS+= ${!defined(HOSTPROG) && !defined(HOSTLIB) && defined(DESTDIR) :? --sysroot=${DESTDIR} :} +.if !defined(HOSTPROG) && !defined(HOSTLIB) && defined(DESTDIR) +CPPFLAGGS+= --sysroot=${DESTDIR} +LDFLAGS+= --sysroot=${DESTDIR} +.endif .endif # EXTERNAL_TOOLCHAIN # } HOST_MKDEP= ${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep