Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.1143
diff -p -u -r1.1143 bsd.own.mk
--- share/mk/bsd.own.mk	30 May 2019 21:33:57 -0000	1.1143
+++ share/mk/bsd.own.mk	2 Jun 2019 08:32:40 -0000
@@ -1148,6 +1148,20 @@ MKRADEONFIRMWARE.i386=		yes
 # Only install the tegra firmware on evbarm.
 MKTEGRAFIRMWARE.evbarm=		yes
 
+# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
+HAVE_MESA_VER?=	18
+.if ${HAVE_MESA_VER} == "10"
+EXTERNAL_MESALIB_DIR?=	MesaLib.old
+.elif ${HAVE_MESA_VER} == "18"
+EXTERNAL_MESALIB_DIR?=	MesaLib
+.endif
+
+# Default to LLVM run-time if x86 and X11 and Mesa 18
+.if ${MKX11} != "no" && ${HAVE_MESA_VER} == "18"
+MKLLVMRT.amd64=		yes
+MKLLVMRT.i386=		yes
+.endif
+
 #
 # MK* options which default to "no".  Note that MKZFS has a different
 # default for some platforms, see above.  Please keep alphabetically
@@ -1281,18 +1295,6 @@ _NEEDS_LIBCXX.x86_64=		yes
 MKLIBCXX:=	yes
 .endif
 
-# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
-HAVE_MESA_VER?=	18
-.if ${HAVE_MESA_VER} == "10"
-EXTERNAL_MESALIB_DIR?=	MesaLib.old
-.elif ${HAVE_MESA_VER} == "18"
-EXTERNAL_MESALIB_DIR?=	MesaLib
-.  if ${MKX11} != "no" && \
-    (${MACHINE} == "amd64" || ${MACHINE} == "i386")
-MKLLVMRT:=		yes
-.  endif
-.endif
-
 #
 # install(1) parameters.
 #
Index: external/mit/xorg/lib/gallium/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/gallium/Makefile,v
retrieving revision 1.28
diff -p -u -r1.28 Makefile
--- external/mit/xorg/lib/gallium/Makefile	30 May 2019 23:15:46 -0000	1.28
+++ external/mit/xorg/lib/gallium/Makefile	2 Jun 2019 08:32:40 -0000
@@ -89,9 +89,9 @@ BUILD_VDPAU=0
 BUILD_LLVMPIPE=0
 BUILD_I915=0
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-BUILD_RADEON=1
 BUILD_I915=1
 .if ${MKLLVMRT} != "no"
+BUILD_RADEON=1
 BUILD_LLVMPIPE=1
 .endif
 .endif