Module Name: src
Committed By: mrg
Date: Sun Jun 2 21:29:13 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
minor hack fix for the previous:
MKX11 is used before it was defaulted, leading to eg:
... Malformed conditional (${MKX11} != "no" && ${HAVE_MESA_VER} == "18")
gain knowledge that it defaults to "no" immediately below.
could split this list, but seems uglier.
To generate a diff of this commit:
cvs rdiff -u -r1.1144 -r1.1145 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.1144 src/share/mk/bsd.own.mk:1.1145
--- src/share/mk/bsd.own.mk:1.1144 Sun Jun 2 11:35:55 2019
+++ src/share/mk/bsd.own.mk Sun Jun 2 21:29:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1144 2019/06/02 11:35:55 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1145 2019/06/02 21:29:13 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1157,7 +1157,9 @@ EXTERNAL_MESALIB_DIR?= MesaLib
.endif
# Default to LLVM run-time if x86 and X11 and Mesa 18
-.if ${MKX11} != "no" && ${HAVE_MESA_VER} == "18"
+# XXX This knows that MKX11=no is default below, but would
+# require splitting the below loop in two parts.
+.if ${MKX11:Uno} != "no" && ${HAVE_MESA_VER} == "18"
MKLLVMRT.amd64= yes
MKLLVMRT.i386= yes
.endif
