diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-08-22 18:48:47 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-08-22 18:48:47 +0000 |
| commit | a7693ee782eb51a5b18f356eb2f4d15b61951f45 (patch) | |
| tree | bd5261361d3dd8ff67a92d65c1762aefeb95967c | |
| parent | 00f4d6ba97af104b3482354cf16a7fc605238ec3 (diff) | |
Remove COMPILER_VERSION tests used to special-case gcc 2, since it is no
longer used.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | lib/libGL/dri/Makefile.inc | 8 | ||||
| -rw-r--r-- | lib/libGLU/Makefile | 4 |
3 files changed, 5 insertions, 11 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2013/02/21 17:45:32 todd Exp $ +# $OpenBSD: Makefile,v 1.52 2013/08/22 18:48:45 miod Exp $ .include <bsd.own.mk> .include <bsd.xconf.mk> @@ -13,7 +13,7 @@ XSERVER= xserver .endif .if defined(XENOCARA_BUILD_PIXMAN) -.if ${COMPILER_VERSION:L:Mgcc[34]*} && ${XENOCARA_BUILD_PIXMAN:L} == "yes" && \ +.if ${XENOCARA_BUILD_PIXMAN:L} == "yes" && \ ${XENOCARA_HAVE_SHARED_LIBS:L} == "yes" XSERVER+= kdrive .endif diff --git a/lib/libGL/dri/Makefile.inc b/lib/libGL/dri/Makefile.inc index 82a3809ae..c0536cc48 100644 --- a/lib/libGL/dri/Makefile.inc +++ b/lib/libGL/dri/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.16 2012/11/28 13:53:16 mpi Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2013/08/22 18:48:46 miod Exp $ .include <bsd.xconf.mk> TOP= ${.CURDIR}/../../../../dist/Mesa @@ -18,13 +18,9 @@ COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \ texmem.c \ drirenderbuffer.c -CFLAGS+= -g -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DPTHREADS \ +CFLAGS+= -std=c99 -g -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DPTHREADS \ $(INCLUDES) $(DRIVER_DEFINES) -.if (${COMPILER_VERSION:L:Mgcc[34]*} != "") -CFLAGS += -std=c99 -.endif - INCLUDES = \ -I$(TOP)/src/mesa/drivers/dri/common \ -I$(TOP)/include \ diff --git a/lib/libGLU/Makefile b/lib/libGLU/Makefile index 37c476781..c8e7f0496 100644 --- a/lib/libGLU/Makefile +++ b/lib/libGLU/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2012/08/17 15:16:44 mpi Exp $ +# $OpenBSD: Makefile,v 1.18 2013/08/22 18:48:46 miod Exp $ .include <bsd.own.mk> DEBUG?= @@ -124,9 +124,7 @@ CPPFLAGS+= -I${DIST}/include \ -I${GLU}/libnurbs/nurbtess \ -DLIBRARYBUILD -D_EXTENSIONS_ -.if ${COMPILER_VERSION:L:Mgcc[34]*} LDADD+= -lsupc++ -.endif NOPROFILE= |