diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2005-09-18 11:56:36 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2005-09-18 11:56:36 +0000 |
| commit | 1d09742223f963b6bc983a60e6a1ee5e36ae735e (patch) | |
| tree | 555327d543cdd770fcade7a24ee53868908c7072 /regress/libexec | |
| parent | 2e054533d198178ed4505f2fc9cf9f804db36b93 (diff) | |
link progs with extra rpath for dlopened libs instead of using
LD_LIBRARY_PATH
Diffstat (limited to 'regress/libexec')
4 files changed, 7 insertions, 10 deletions
diff --git a/regress/libexec/ld.so/dlsym/test2/Makefile.inc b/regress/libexec/ld.so/dlsym/test2/Makefile.inc index ac94979fffb..3fc1aadb855 100644 --- a/regress/libexec/ld.so/dlsym/test2/Makefile.inc +++ b/regress/libexec/ld.so/dlsym/test2/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1 2005/09/15 22:16:27 kurt Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2005/09/18 11:56:34 kurt Exp $ .include <bsd.obj.mk> @@ -17,6 +17,3 @@ BB_OBJDIR!= if [ -d $(BB_DIR)/${__objdir} ]; then \ else \ echo "$(BB_DIR)"; \ fi - -run-regress-${PROG}: ${PROG} - LD_LIBRARY_PATH=$(BB_OBJDIR) ./${PROG} diff --git a/regress/libexec/ld.so/dlsym/test2/prog1/Makefile b/regress/libexec/ld.so/dlsym/test2/prog1/Makefile index 2fbbf1322f9..e4d43dcf88f 100644 --- a/regress/libexec/ld.so/dlsym/test2/prog1/Makefile +++ b/regress/libexec/ld.so/dlsym/test2/prog1/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2005/09/15 22:16:27 kurt Exp $ +# $OpenBSD: Makefile,v 1.2 2005/09/18 11:56:34 kurt Exp $ .include <../Makefile.inc> PROG= prog1 SRCS= main.c -LDADD= -Wl,-E -Wl,-rpath,$(AA_OBJDIR) -L$(AA_OBJDIR) -laa +LDADD= -Wl,-E -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(BB_OBJDIR) -L$(AA_OBJDIR) -laa .include <bsd.regress.mk> diff --git a/regress/libexec/ld.so/dlsym/test2/prog2/Makefile b/regress/libexec/ld.so/dlsym/test2/prog2/Makefile index fe86ca612ab..f01536ae90c 100644 --- a/regress/libexec/ld.so/dlsym/test2/prog2/Makefile +++ b/regress/libexec/ld.so/dlsym/test2/prog2/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2005/09/15 22:16:27 kurt Exp $ +# $OpenBSD: Makefile,v 1.2 2005/09/18 11:56:34 kurt Exp $ .include <../Makefile.inc> PROG= prog2 SRCS= main.c -LDADD= -Wl,-E -Wl,-rpath,$(AA_OBJDIR) -L$(AA_OBJDIR) -laa +LDADD= -Wl,-E -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(BB_OBJDIR) -L$(AA_OBJDIR) -laa .include <bsd.regress.mk> diff --git a/regress/libexec/ld.so/dlsym/test2/prog3/Makefile b/regress/libexec/ld.so/dlsym/test2/prog3/Makefile index 69b61832b45..86ca0d16531 100644 --- a/regress/libexec/ld.so/dlsym/test2/prog3/Makefile +++ b/regress/libexec/ld.so/dlsym/test2/prog3/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2005/09/15 22:16:27 kurt Exp $ +# $OpenBSD: Makefile,v 1.2 2005/09/18 11:56:35 kurt Exp $ .include <../Makefile.inc> PROG= prog3 SRCS= main.c -LDADD= -Wl,-E -Wl,-rpath,$(AA_OBJDIR) -L$(AA_OBJDIR) -laa +LDADD= -Wl,-E -Wl,-rpath,$(AA_OBJDIR) -Wl,-rpath,$(BB_OBJDIR) -L$(AA_OBJDIR) -laa .include <bsd.regress.mk> |