From 4deeb07029db0412704e811b0e924993fe415641 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Tue, 6 Aug 2013 19:05:58 +0000
Subject: Switch vax to gcc 3.3.6.

---
 gnu/usr.bin/cvs/Makefile.bsd-wrapper    | 9 +++++++--
 gnu/usr.bin/lynx/Makefile.bsd-wrapper   | 6 +++---
 gnu/usr.sbin/sendmail/sendmail/Makefile | 6 +++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index 897821374b9..9e92d84137d 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.47 2007/11/03 10:32:56 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.48 2013/08/06 19:05:57 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -20,8 +20,13 @@ KRB5=--with-gssapi=/usr --enable-encryption
 KRB5=
 .endif
 
+LDFLAGS=${LDSTATIC}
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
+
 all:	config.status
-	${MAKE} ${GNUCFLAGS} LDFLAGS=${LDSTATIC} all info
+	${MAKE} ${GNUCFLAGS} LDFLAGS="${LDFLAGS}" all info
 
 .FORCE:	.IGNORE
 
diff --git a/gnu/usr.bin/lynx/Makefile.bsd-wrapper b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
index 7ad5d6fdee2..e1fd59bcf8b 100644
--- a/gnu/usr.bin/lynx/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.22 2013/02/19 05:42:50 brad Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.23 2013/08/06 19:05:57 miod Exp $
 
 MAN=	lynx.1
 CLEANFILES+= lynx.1
 DPADD=	${LIBSSL} ${LIBCRYPTO}
 
 .if (${MACHINE} == "vax")
-OPT=-O0
+LDFLAGS+=	-Wl,--no-keep-memory
 .endif
 
-GNUCFLAGS=	CC="${CC}" CFLAGS="${CFLAGS} ${COPTS} ${OPT}"
+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
 HELPFILES=	keystrokes/alt_edit_help.html keystrokes/bookmark_help.html \
diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index 227d01dea31..94e6602205d 100644
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2008/08/20 22:19:49 dlg Exp $
+#	$OpenBSD: Makefile,v 1.29 2013/08/06 19:05:57 miod Exp $
 
 PROG=	sendmail
 
@@ -21,6 +21,10 @@ LDADD+= -lsasl2
 LDFLAGS+=-L/usr/local/lib
 .endif
 
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
+
 # Compile with milter support.
 ENVDEF+= -DMILTER
 
-- 
cgit v1.2.3