diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2015-07-26 19:30:59 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2015-07-26 19:30:59 +0000 |
| commit | 7376bfa721121970520af05294facf24505bff0c (patch) | |
| tree | e5ead983f0e6c9ec98064be630458c9469ac627b /libexec | |
| parent | 845feaa5268e185bfbba5d755016d38ede81f89d (diff) | |
Reenable the ld.so pre-install test; the "am I cross-compiling" test was
too loose. Update the test to try to exercise the printf binding twice.
ok miod@
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.so/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile index 08da3161519..558fb43a488 100644 --- a/libexec/ld.so/Makefile +++ b/libexec/ld.so/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2015/05/26 20:15:54 miod Exp $ +# $OpenBSD: Makefile,v 1.57 2015/07/26 19:30:58 guenther Exp $ SUBDIR=ldconfig ldd MAN= ld.so.1 @@ -42,13 +42,13 @@ candidate= $(PROG).test CLEANFILES+= ${candidate} $(test_prog): - printf '#include <stdio.h>\nint main(int argc, char **argv){ printf("%%s\\n", argv[1]); }\n' | \ + 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 $@ $(PROG): $(test_prog) $(LD) -x -e _dl_start $(ELF_LDFLAGS) -o $(candidate) $(OBJS) $(LDADD) -.ifndef HOSTCC - ulimit -c 0; [ "`${.OBJDIR}/$(test_prog) ok`" = ok ] +.ifndef CROSSDIR + ulimit -c 0; [ "`${.OBJDIR}/$(test_prog) ok`" = "${.OBJDIR}/$(test_prog): ok!" ] .endif cp $(candidate) $@ .endif |