diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-08-27 22:16:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-08-27 22:16:15 +0000 |
| commit | d8cf076edf2053f1c4097cb9fcc7d7da9a282eb2 (patch) | |
| tree | 323d3fbcaf4eea2ebbb22fc112fb3c9efc2bcb41 | |
| parent | 5007ca9e793fbd31a04ee6f508e4c7681235536a (diff) | |
The test program run before ld.so is installed was encoding the $OBJDIR
path to ld.so. Since the testprogram is run from inside $OBJDIR, encode
with a ./ path instead.
ok kettenis visa
| -rw-r--r-- | libexec/ld.so/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile index d087d59780b..fc49cf49fce 100644 --- a/libexec/ld.so/Makefile +++ b/libexec/ld.so/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.67 2017/08/27 22:14:12 deraadt Exp $ +# $OpenBSD: Makefile,v 1.68 2017/08/27 22:16:14 deraadt Exp $ SUBDIR=ldconfig ldd MAN= ld.so.1 @@ -60,7 +60,7 @@ CLEANFILES+= ${candidate} $(test_prog): printf '#include <stdio.h>\nint main(int argc, char **argv){ printf("%%s: ", argv[0]); printf("%%s!\\n", argv[1] ? argv[1] : "foo"); }\n' | \ - $(CC) -x c - -Wl,-dynamic-linker,${.OBJDIR}/$(candidate) -o $@ + $(CC) -x c - -Wl,-dynamic-linker,./$(candidate) -o $@ $(PROG): $(test_prog) ${VERSION_SCRIPT} $(OBJS) $(LD) ${DEBUG} -x -e _dl_start $(ELF_LDFLAGS) -o $(candidate) \ |