diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-04-15 20:55:43 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-04-15 20:55:43 +0000 |
| commit | ffdbd7167bd6d0564a798b56f8ce0e4e7816080d (patch) | |
| tree | ce03bbbb48acc04b3a21ff5a4d5c6943b6895e7b /usr.bin | |
| parent | 3180a8aef52e910d14b92f63c6b05b7ed7119673 (diff) | |
Remove workarounds for ld reaching MAXDSIZ on vax, now that MAXDSIZ is
more comfortable.
Reminded by brad@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/passwd/Makefile | 5 | ||||
| -rw-r--r-- | usr.bin/telnet/Makefile | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index e44581d76c6..1cdc9779fcf 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2013/08/06 19:05:57 miod Exp $ +# $OpenBSD: Makefile,v 1.37 2014/04/15 20:55:42 miod Exp $ .include <bsd.own.mk> @@ -23,9 +23,6 @@ CFLAGS+= -DKRB5 DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} LDADD+= -lkrb5 -lasn1 -lcrypto LDADD+= -lwind -lroken -lcom_err -lheimbase -.if ${MACHINE} == "vax" -LDFLAGS+=-Wl,--no-keep-memory -.endif .endif BINMODE=4555 diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index b0df5b796d1..a3f1d4a7a7f 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2013/08/06 19:05:57 miod Exp $ +# $OpenBSD: Makefile,v 1.29 2014/04/15 20:55:42 miod Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -49,9 +49,6 @@ DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} LDADD+= -lkrb5 -lasn1 -lcrypto LDADD+= -lwind -lroken -lcom_err -lheimbase SRCS+= kerberos5.c enc_des.c -.if ${MACHINE} == "vax" -LDFLAGS+=-Wl,--no-keep-memory -.endif .endif .include <bsd.prog.mk> |