svn commit: r354823 - head/graphics/dri

[Koop Mast]

Author: kwm
Date: Thu May 22 10:25:39 2014
New Revision: 354823
URL: http://svnweb.freebsd.org/changeset/ports/354823
QAT: https://qat.redports.org/buildarchive/r354823/

Log:
  Tweak OSVERSION check to also include newer 9.x versions, since gcc from
  base is not good enough.
  For i386 depend on gcc form ports. This is due to a clang assertion [1],
  which has been reported in the clang bugtracker.
  
  Reported by:	many [1]

Modified:
  head/graphics/dri/Makefile

Modified: head/graphics/dri/Makefile
==============================================================================
--- head/graphics/dri/Makefile	Thu May 22 10:20:03 2014	(r354822)
+++ head/graphics/dri/Makefile	Thu May 22 10:25:39 2014	(r354823)
@@ -21,12 +21,13 @@ USE_XORG=	glproto x11 xext xxf86vm xdama
 # 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)
+. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000) \
+		&& ${ARCH} == amd64
 CC=clang
 CXX=clang++
 CPP=clang-cpp
-. elif ${OSVERSION} < 901500
+# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older.
+. elif ${OSVERSION} < 901500 || ${ARCH} == i386)
 USE_GCC=yes
 . endif
 .endif