diff options
| author |   niklas <niklas@openbsd.org> | 2003-07-01 07:08:31 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 2003-07-01 07:08:31 +0000 |
| commit | 25b2e420b3d5f868e41840ed47ca62160a3a9e01 (patch) | |
| tree | beb66a3b8eb47c851a9ec40983addbe2e653c685 | |
| parent | try to vary physical directory layout of the libdir. (diff) | |
| download | wireguard-openbsd-25b2e420b3d5f868e41840ed47ca62160a3a9e01.tar.xz wireguard-openbsd-25b2e420b3d5f868e41840ed47ca62160a3a9e01.zip | |
Do not try unversioned lib tests on a.out
| -rw-r--r-- | regress/libexec/ld.so/link-order/Makefile | 9 | ||||
| -rw-r--r-- | regress/libexec/ld.so/link-order/test/Makefile | 18 |
2 files changed, 21 insertions, 6 deletions
diff --git a/regress/libexec/ld.so/link-order/Makefile b/regress/libexec/ld.so/link-order/Makefile index 7ba418df8be..e5cbcc5a7a5 100644 --- a/regress/libexec/ld.so/link-order/Makefile +++ b/regress/libexec/ld.so/link-order/Makefile @@ -1,6 +1,11 @@ -# $OpenBSD: Makefile,v 1.1 2003/07/01 05:51:30 niklas Exp $ +# $OpenBSD: Makefile,v 1.2 2003/07/01 07:08:31 niklas Exp $ -SUBDIR+= libnover lib10 lib11 lib20 prog test +.include <bsd.own.mk> + +.if (${ELF_TOOLCHAIN} == "yes") +SUBDIR+= libnover +.endif +SUBDIR+= lib10 lib11 lib20 prog test install: diff --git a/regress/libexec/ld.so/link-order/test/Makefile b/regress/libexec/ld.so/link-order/test/Makefile index 6b129ddeac1..19a26fc275f 100644 --- a/regress/libexec/ld.so/link-order/test/Makefile +++ b/regress/libexec/ld.so/link-order/test/Makefile @@ -1,11 +1,16 @@ -# $OpenBSD: Makefile,v 1.2 2003/07/01 06:43:03 niklas Exp $ +# $OpenBSD: Makefile,v 1.3 2003/07/01 07:08:31 niklas Exp $ -REGRESS_TARGETS= test-none test-nover test-single test-minor-1 \ - test-minor-2 test-major-1 test-major-2 \ - test-nover-single-1 test-nover-single-2 +.include <bsd.own.mk> + +REGRESS_TARGETS= test-none test-single test-minor-1 test-minor-2 \ + test-major-1 test-major-2 +.if (${ELF_TOOLCHAIN} == "yes") +REGRESS_TARGETS+= test-nover test-nover-single-1 test-nover-single-2 +.endif .include <bsd.obj.mk> +.if (${ELF_TOOLCHAIN} == "yes") DIR_NOVER=${.CURDIR}/../libnover OBJDIR_NOVER!= if [ -d $(DIR_NOVER)/${__objdir} ]; then \ @@ -13,6 +18,7 @@ OBJDIR_NOVER!= if [ -d $(DIR_NOVER)/${__objdir} ]; then \ else \ echo "$(DIR_NOVER)"; \ fi +.endif DIR_10=${.CURDIR}/../lib10 @@ -57,9 +63,11 @@ clean: test-none: make-lib clean sh ${.CURDIR}/test.sh ${PROGPATH} '%ERROR%' +.if (${ELF_TOOLCHAIN} == "yes") test-nover: make-lib clean cp ${OBJDIR_NOVER}/libtest.so lib/ sh ${.CURDIR}/test.sh ${PROGPATH} none +.endif test-single: make-lib clean cp ${OBJDIR_10}/libtest.so.1.0 lib/ @@ -81,6 +89,7 @@ test-major-2: make-lib clean cp ${OBJDIR_11}/libtest.so.1.1 ${OBJDIR_20}/libtest.so.2.0 lib/ sh ${.CURDIR}/test.sh ${PROGPATH} 2.0 +.if (${ELF_TOOLCHAIN} == "yes") test-nover-single-1: make-lib clean cp ${OBJDIR_NOVER}/libtest.so ${OBJDIR_10}/libtest.so.1.0 lib/ sh ${.CURDIR}/test.sh ${PROGPATH} none @@ -88,5 +97,6 @@ test-nover-single-1: make-lib clean test-nover-single-2: make-lib clean cp ${OBJDIR_10}/libtest.so.1.0 ${OBJDIR_NOVER}/libtest.so lib/ sh ${.CURDIR}/test.sh ${PROGPATH} none +.endif .include <bsd.regress.mk> |