Source-Changes-HG archive

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

[src/trunk]: src/share/mk Use ?: operator to determine when to add --sysroot....



details:   https://anonhg.NetBSD.org/src/rev/5f8889c82091
branches:  trunk
changeset: 764039:5f8889c82091
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Apr 10 21:03:17 2011 +0000

description:
Use ?: operator to determine when to add --sysroot. Unbreaks clang
bootstrap.

diffstat:

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

diffs (20 lines):

diff -r ee782c8329f5 -r 5f8889c82091 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Apr 10 20:59:22 2011 +0000
+++ b/share/mk/bsd.own.mk       Sun Apr 10 21:03:17 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.654 2011/04/10 16:52:36 joerg Exp $
+#      $NetBSD: bsd.own.mk,v 1.655 2011/04/10 21:03:17 joerg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -207,8 +207,8 @@
 OBJC=          false
 .endif
 
-CPPFLAGS+=     ${HOSTPROG:U${HOSTLIB:U${DESTDIR:D--sysroot=${DESTDIR}}}}
-LDFLAGS+=      ${HOSTPROG:U${HOSTLIB:U${DESTDIR:D--sysroot=${DESTDIR}}}}
+CPPFLAGS+=     ${!defined(HOSTPROG) && !defined(HOSTLIB) && defined(DESTDIR) :? --sysroot=${DESTDIR} :}
+LDFLAGS+=      ${!defined(HOSTPROG) && !defined(HOSTLIB) && defined(DESTDIR) :? --sysroot=${DESTDIR} :}
 .endif # EXTERNAL_TOOLCHAIN                                            # }
 
 HOST_MKDEP=    ${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep



Home | Main Index | Thread Index | Old Index