summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-04-15 20:55:43 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-04-15 20:55:43 +0000
commitffdbd7167bd6d0564a798b56f8ce0e4e7816080d (patch)
treece03bbbb48acc04b3a21ff5a4d5c6943b6895e7b /gnu
parent3180a8aef52e910d14b92f63c6b05b7ed7119673 (diff)
Remove workarounds for ld reaching MAXDSIZ on vax, now that MAXDSIZ is
more comfortable. Reminded by brad@
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/cvs/Makefile.bsd-wrapper5
-rw-r--r--gnu/usr.bin/lynx/Makefile.bsd-wrapper6
-rw-r--r--gnu/usr.sbin/sendmail/sendmail/Makefile6
3 files changed, 3 insertions, 14 deletions
diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index 25f3a1038e4..aec81f983aa 100644
--- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.49 2013/11/11 22:58:53 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.50 2014/04/15 20:55:42 miod Exp $
.include <bsd.own.mk>
@@ -21,9 +21,6 @@ KRB5=
# .endif
LDFLAGS=${LDSTATIC}
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
all: config.status
${MAKE} ${GNUCFLAGS} LDFLAGS="${LDFLAGS}" all info
diff --git a/gnu/usr.bin/lynx/Makefile.bsd-wrapper b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
index e1fd59bcf8b..d61e3dc4d16 100644
--- a/gnu/usr.bin/lynx/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
@@ -1,13 +1,9 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.23 2013/08/06 19:05:57 miod Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.24 2014/04/15 20:55:42 miod Exp $
MAN= lynx.1
CLEANFILES+= lynx.1
DPADD= ${LIBSSL} ${LIBCRYPTO}
-.if (${MACHINE} == "vax")
-LDFLAGS+= -Wl,--no-keep-memory
-.endif
-
GNUCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS} ${OPT}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-ssl=/usr --enable-widec --enable-ipv6 --enable-debug
HTMLDIR= /usr/share/doc/html
diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index 2a4f9809838..afe7a3941ad 100644
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2014/04/13 08:35:27 brad Exp $
+# $OpenBSD: Makefile,v 1.32 2014/04/15 20:55:42 miod Exp $
PROG= sendmail
@@ -20,10 +20,6 @@ LDADD+= -lsasl2
LDFLAGS+=-L/usr/local/lib
.endif
-.if ${MACHINE} == "vax"
-LDFLAGS+=-Wl,--no-keep-memory
-.endif
-
# Compile with milter support.
ENVDEF+= -DMILTER