diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2010-05-10 18:20:32 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2010-05-10 18:20:32 +0000 |
| commit | 3d048d0ab0d9212a257df4643785a7fc4500f65a (patch) | |
| tree | ee69a2ee7a0126c6826e618641e3694b28356554 /regress | |
| parent | 74ec6f5d77854dfd44aaf3ee3e8836f9a15c38ff (diff) | |
Switch to using COMPILER_VERSION instead of USE_GCC3, allows for more flexible
complier picking, eg supporting gcc2, gcc3, and gcc4. based on diff by Marco,
with fixes from espie@.
ok espie@ general mumbling of approval of others.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/gnu/egcs/gcc-bounds/Makefile | 6 | ||||
| -rw-r--r-- | regress/gnu/egcs/gcc/Makefile | 6 | ||||
| -rw-r--r-- | regress/gnu/egcs/libf2c/Makefile | 8 | ||||
| -rw-r--r-- | regress/lib/libc/cxa-atexit/Makefile | 5 | ||||
| -rw-r--r-- | regress/libexec/ld.so/hidden/Makefile | 6 |
5 files changed, 16 insertions, 15 deletions
diff --git a/regress/gnu/egcs/gcc-bounds/Makefile b/regress/gnu/egcs/gcc-bounds/Makefile index 1302bca8ae1..d0026aa8ddf 100644 --- a/regress/gnu/egcs/gcc-bounds/Makefile +++ b/regress/gnu/egcs/gcc-bounds/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2006/07/11 11:59:53 avsm Exp $ +# $OpenBSD: Makefile,v 1.11 2010/05/10 18:20:31 drahn Exp $ C_MODULES?= strlcpy strlcat getcwd memcpy fread memcpy declare \ sscanf vararray md builtins @@ -53,8 +53,10 @@ generate: NOOBJ= Yes .include <bsd.regress.mk> -.if ${USE_GCC3:L:Myes} +.if ${COMPILER_VERSION:L} == "gcc3" EXP= .exp.gcc3 +.elif ${COMPILER_VERSION:L} == "gcc4" +EXP= .exp.gcc4 .else EXP= .exp .endif diff --git a/regress/gnu/egcs/gcc/Makefile b/regress/gnu/egcs/gcc/Makefile index 0dd2a2bd569..9c4f3f68a7e 100644 --- a/regress/gnu/egcs/gcc/Makefile +++ b/regress/gnu/egcs/gcc/Makefile @@ -1,12 +1,14 @@ -# $OpenBSD: Makefile,v 1.6 2006/02/11 23:54:34 david Exp $ +# $OpenBSD: Makefile,v 1.7 2010/05/10 18:20:31 drahn Exp $ .include <bsd.own.mk> NOMAN= NOPROG= -.if ${USE_GCC3:L:Myes} +.if ${COMPILER_VERSION:L} == "gcc3" TESTDIR=${BSDSRCDIR}/gnu/usr.bin/gcc +.elif ${COMPILER_VERSION:L} == "gcc4" +TESTDIR=${BSDSRCDIR}/gnu/usr.bin/cc .else TESTDIR=${BSDSRCDIR}/gnu/egcs/gcc .endif diff --git a/regress/gnu/egcs/libf2c/Makefile b/regress/gnu/egcs/libf2c/Makefile index 5a8797244c4..db1e423bdc8 100644 --- a/regress/gnu/egcs/libf2c/Makefile +++ b/regress/gnu/egcs/libf2c/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.6 2006/02/11 23:54:34 david Exp $ +# $OpenBSD: Makefile,v 1.7 2010/05/10 18:20:31 drahn Exp $ .include <bsd.own.mk> NOMAN= NOPROG= -.if ${USE_GCC3:L:Myes} +.if ${COMPILER_VERSION:L} == "gcc3" TESTDIR=${BSDSRCDIR}/gnu/lib/libf2c TEST2DIR=${BSDSRCDIR}/gnu/usr.bin/gcc -.else +.elif ${COMPILER_VERSION:L} == "gcc2" TESTDIR=${BSDSRCDIR}/gnu/egcs/libf2c TEST2DIR=${BSDSRCDIR}/gnu/egcs/gcc .endif @@ -19,7 +19,7 @@ TEST4DIR=${TEST2DIR}/ REGRESS_TARGETS=do-libf2c -.if !defined(DO_DEJATESTS) +.if !defined(DO_DEJATESTS) && defined(TESTDIR) REGRESS_SKIP_TARGETS=do-libf2c .endif diff --git a/regress/lib/libc/cxa-atexit/Makefile b/regress/lib/libc/cxa-atexit/Makefile index ffd83fe1ca4..5061ca04ac8 100644 --- a/regress/lib/libc/cxa-atexit/Makefile +++ b/regress/lib/libc/cxa-atexit/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2007/09/03 14:42:44 millert Exp $ +# $OpenBSD: Makefile,v 1.2 2010/05/10 18:20:31 drahn Exp $ .include <bsd.own.mk> -USE_GCC3?=No -.if ${USE_GCC3:L} == "yes" +.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4" SUBDIR+= libgd1 libgd2 test1 .endif diff --git a/regress/libexec/ld.so/hidden/Makefile b/regress/libexec/ld.so/hidden/Makefile index f7cd54cfd1e..c3751a2434d 100644 --- a/regress/libexec/ld.so/hidden/Makefile +++ b/regress/libexec/ld.so/hidden/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 2007/07/31 20:31:42 kurt Exp $ +# $OpenBSD: Makefile,v 1.2 2010/05/10 18:20:31 drahn Exp $ .include <bsd.own.mk> -USE_GCC3?=No - -.if ${USE_GCC3:L} == "yes" +.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4" SUBDIR+= libaa libab test1 test2 .endif |