diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-08-06 19:11:54 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-08-06 19:11:54 +0000 |
| commit | 81a80cf18dfb0d2c181f37070df4c0bcee447b6f (patch) | |
| tree | 2b540bea449476e38cd4184199337f3139843d9a /regress/libexec | |
| parent | 4deeb07029db0412704e811b0e924993fe415641 (diff) | |
Remove support for COMPILER_VERSION == gcc2.
Change the logic depending upon COMPILER_VERSION everywhere, to assume gcc4
is the norm and to explicitely test for gcc3 when a different behaviour
is required.
No functional change intended. Be sure to `make install' in share/mk before
attempting to do anything.
Diffstat (limited to 'regress/libexec')
| -rw-r--r-- | regress/libexec/ld.so/df_1_noopen/Makefile | 10 | ||||
| -rw-r--r-- | regress/libexec/ld.so/hidden/Makefile | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/regress/libexec/ld.so/df_1_noopen/Makefile b/regress/libexec/ld.so/df_1_noopen/Makefile index b59bb852fde..485b8719be4 100644 --- a/regress/libexec/ld.so/df_1_noopen/Makefile +++ b/regress/libexec/ld.so/df_1_noopen/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2013/04/02 07:15:02 miod Exp $ +# $OpenBSD: Makefile,v 1.4 2013/08/06 19:11:53 miod Exp $ .include <bsd.own.mk> @@ -6,10 +6,7 @@ REGRESS_TARGETS = test .include <bsd.regress.mk> -.if ${COMPILER_VERSION} == "gcc4" -EMPTYFILE= /dev/null -LIB_DEPENDS= -.else +.if ${COMPILER_VERSION} == "gcc3" EMPTYFILE= emptyfile CLEANFILES+= ${EMPTYFILE} LIB_DEPENDS= ${EMPTYFILE} @@ -18,6 +15,9 @@ LIB_DEPENDS= ${EMPTYFILE} # is not at least four bytes long! ${EMPTYFILE}: printf "\n\n\n\n" > $@ +.else +EMPTYFILE= /dev/null +LIB_DEPENDS= .endif CLEANFILES+=lib1.so lib2.so lib3.so dlopen dlopen1 dlopen2 dlopen3 diff --git a/regress/libexec/ld.so/hidden/Makefile b/regress/libexec/ld.so/hidden/Makefile index c3751a2434d..7fec9799ef1 100644 --- a/regress/libexec/ld.so/hidden/Makefile +++ b/regress/libexec/ld.so/hidden/Makefile @@ -1,10 +1,6 @@ -# $OpenBSD: Makefile,v 1.2 2010/05/10 18:20:31 drahn Exp $ +# $OpenBSD: Makefile,v 1.3 2013/08/06 19:11:53 miod Exp $ -.include <bsd.own.mk> - -.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4" SUBDIR+= libaa libab test1 test2 -.endif install: |