diff options
| author |   deraadt <deraadt@openbsd.org> | 2017-08-27 22:16:14 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2017-08-27 22:16:14 +0000 |
| commit | c8bdf7d452b26a321d9ad8d4102b3ac37f59f1dc (patch) | |
| tree | 0d30ceed45e60aaef2e9e122180c3562e8f041d3 | |
| parent | Link the ~45 .o which become ld.so in a random order. (diff) | |
| download | wireguard-openbsd-c8bdf7d452b26a321d9ad8d4102b3ac37f59f1dc.tar.xz wireguard-openbsd-c8bdf7d452b26a321d9ad8d4102b3ac37f59f1dc.zip | |
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) \ |