Module Name: src
Committed By: joerg
Date: Sun Apr 10 21:03:17 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Use ?: operator to determine when to add --sysroot. Unbreaks clang
bootstrap.
To generate a diff of this commit:
cvs rdiff -u -r1.654 -r1.655 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.654 src/share/mk/bsd.own.mk:1.655
--- src/share/mk/bsd.own.mk:1.654 Sun Apr 10 16:52:36 2011
+++ src/share/mk/bsd.own.mk Sun Apr 10 21:03:17 2011
@@ -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
