Source-Changes-HG archive

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

[src/trunk]: src/share/mk minor hack fix for the previous:



details:   https://anonhg.NetBSD.org/src/rev/36fa8581a71f
branches:  trunk
changeset: 451766:36fa8581a71f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jun 02 21:29:13 2019 +0000

description:
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.

diffstat:

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

diffs (20 lines):

diff -r 4dbd838f9dac -r 36fa8581a71f share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Jun 02 20:18:23 2019 +0000
+++ b/share/mk/bsd.own.mk       Sun Jun 02 21:29:13 2019 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index