diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-09-05 15:27:59 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-09-05 15:27:59 +0000 |
| commit | 1f344155c5dbcf7053a6bc909b8e744634388696 (patch) | |
| tree | 567a7922e431027592ac00a625d78931d8307678 | |
| parent | c4ea4fbadf0301e13a071f572dfc0ac65266eb8e (diff) | |
fix a merge error
| -rw-r--r-- | lib/libGL/gallium/drivers/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libGL/gallium/drivers/Makefile b/lib/libGL/gallium/drivers/Makefile index 63d97afb3..0bdb9ba5d 100644 --- a/lib/libGL/gallium/drivers/Makefile +++ b/lib/libGL/gallium/drivers/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2013/09/05 15:11:59 jsg Exp $ +# $OpenBSD: Makefile,v 1.7 2013/09/05 15:27:58 jsg Exp $ .include <bsd.xconf.mk> SUBDIR= rbug softpipe trace @@ -7,8 +7,9 @@ SUBDIR= rbug softpipe trace SUBDIR+= llvmpipe radeonsi .endif -.if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm" && - (${MACHINE} == i386 || ${MACHINE} == amd64 || ${MACHINE} == macppc || ${MACHINE} == sparc64) +.if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm" && \ + (${MACHINE} == i386 || ${MACHINE} == amd64 || ${MACHINE} == macppc || \ + ${MACHINE} == sparc64) SUBDIR+= r300 r600 .endif |