Switch last workaround to a form easier for espie to maintain.

2 files changed, 8 insertions, 5 deletions

diff --git a/gnu/egcs/gcc/Makefile.bsd-wrapper b/gnu/egcs/gcc/Makefile.bsd-wrapper
index 0c813b6d951..9243cc50e1b 100644
--- a/gnu/egcs/gcc/Makefile.bsd-wrapper
+++ b/gnu/egcs/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.7 2001/01/29 16:56:10 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.8 2002/01/21 16:37:19 hugh Exp $
 
 MAN=		cccp.1 gcc.1 
 MLINKS+=	gcc.1 cc.1
@@ -13,6 +13,8 @@ MLINKS+=	g++.1 c++.1
 MLINKS+=	g77.1 f77.1
 .endif
 
+VAXHOST_CFLAGS=	-DIN_GCC -DOPENBSD_NATIVE -DHAVE_CONFIG_H -O0
+
 GXX_INCDIR=	/usr/include/g++
 GNUCFLAGS=	CFLAGS="${CFLAGS} ${COPTS} -DOPENBSD_NATIVE"
 CLEANFILES=	.gdbinit */.gdbinit *.info* \
@@ -36,8 +38,13 @@ M_ARCH=		${MACHINE_ARCH}
 GCCARCH=	${M_ARCH}-unknown-openbsd`uname -r`
 
 all:	config.status
+.if ${MACHINE_ARCH} == "vax"
+	${MAKE} ${GNUCFLAGS} CC="${CC}" LDFLAGS="${LDSTATIC}" \
+		HOST_CFLAGS="${VAXHOST_CFLAGS}" build_infodir=. all doc
+.else
 	${MAKE} ${GNUCFLAGS} CC="${CC}" LDFLAGS="${LDSTATIC}" \
 		build_infodir=. all doc
+.endif
 
 tree-check.h: config.status
 	${MAKE} ${GNUCFLAGS} CC="${CC}" LDFLAGS="${LDSTATIC}" \
diff --git a/gnu/egcs/gcc/Makefile.in b/gnu/egcs/gcc/Makefile.in
index 6a2983a77d4..ac9959a3977 100644
--- a/gnu/egcs/gcc/Makefile.in
+++ b/gnu/egcs/gcc/Makefile.in
@@ -465,11 +465,7 @@ HOST_PREFIX=
 # out of the way of the other rules for compiling the same source files.
 HOST_PREFIX_1=loser-
 HOST_CC=$(CC)
-.if ${MACHINE_ARCH} == "vax"
-HOST_CFLAGS=$(ALL_CFLAGS) -O0
-.else
 HOST_CFLAGS=$(ALL_CFLAGS)
-.endif
 HOST_CLIB=$(CLIB)
 HOST_INTLLIBS=$(INTLLIBS)
 HOST_LDFLAGS=$(LDFLAGS)