Index: graphics/dri/Makefile
===================================================================
--- graphics/dri/Makefile	(revision 354558)
+++ graphics/dri/Makefile	(working copy)
@@ -21,12 +21,13 @@
 # We only care for 9.x and 8.x, not for old pre-clang default current.
 # This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver.
 .if defined(WITH_NEW_XORG)
-. if ${OSVERSION} >= 901500 && ${OSVERSION} < 902502 \
-		&& (${ARCH} == i386 || ${ARCH} == amd64)
+# i386 triggers a clang bug 19778. This happens with clang 3.4.1 and older.
+. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000) \
+		&& ${ARCH} == amd64
 CC=clang
 CXX=clang++
 CPP=clang-cpp
-. elif ${OSVERSION} < 901500
+. elif ${OSVERSION} < 901500 || (${OSVERSION} < 1000000 && ${ARCH} == i386)
 USE_GCC=yes
 . endif
 .endif