diff options
| author | kwm <kwm@FreeBSD.org> | 2014-05-31 22:15:47 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2014-05-31 22:15:47 +0800 |
| commit | cca7675bb241e3d00bf4cd03c225eb1ed57bc14f (patch) | |
| tree | 08a72d735095c571391c89b41ebd6034ae94407d | |
| parent | 15d15d93d8c266e7b782ef7b5ba442a6c970732a (diff) | |
| download | freebsd-ports-gnome-cca7675bb241e3d00bf4cd03c225eb1ed57bc14f.tar.gz freebsd-ports-gnome-cca7675bb241e3d00bf4cd03c225eb1ed57bc14f.tar.zst freebsd-ports-gnome-cca7675bb241e3d00bf4cd03c225eb1ed57bc14f.zip | |
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.
| -rw-r--r-- | graphics/dri/Makefile | 3 | ||||
| -rw-r--r-- | graphics/libGL/bsd.mesalib.mk | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index aaea0a78fdc0..64489bbc58b1 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -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 diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index eeb3a7a9a48e..ab2ec5997eba 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -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 |