Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Simplify and correct (previous did not work for !de...



details:   https://anonhg.NetBSD.org/src/rev/ab3114491a82
branches:  trunk
changeset: 764331:ab3114491a82
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 16 21:41:24 2011 +0000

description:
Simplify and correct (previous did not work for !defined(DESTDIR)

diffstat:

 share/mk/bsd.own.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r 2ba77575aa6e -r ab3114491a82 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Apr 16 20:39:18 2011 +0000
+++ b/share/mk/bsd.own.mk       Sat Apr 16 21:41:24 2011 +0000
@@ -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



Home | Main Index | Thread Index | Old Index