Move the ARCH = i386 check to bsd.mesalib.mk so it applies to all

Mesa ports. This will unbreak libglapi/libGL/libglesv2 on i386.

This was probably exposed by when the libglapi port was added.
This commit is contained in:
Koop Mast 2014-05-31 14:15:47 +00:00
parent 70e0487f6e
commit ea02e52634
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=355979
2 changed files with 6 additions and 2 deletions

View file

@ -26,8 +26,7 @@ USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
CC=clang
CXX=clang++
CPP=clang-cpp
# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older.
. elif ${OSVERSION} < 901500 || ${ARCH} == i386
. elif ${OSVERSION} < 901500
USE_GCC=yes
. endif
.endif

View file

@ -56,6 +56,11 @@ SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
src/gallium/drivers/svga/svgadump/svga_dump.py \
src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \
src/mapi/mapi/mapi_abi.py
# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older.
. if ${ARCH} == i386
USE_GCC=yes
. endif
.else
CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu