===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.87
retrieving revision 1.90
diff -u -r1.87 -r1.90
--- src/Makefile	2002/08/16 02:04:58	1.87
+++ src/Makefile	2003/04/17 03:48:56	1.90
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.87 2002/08/16 02:04:58 wcobb Exp $
+#	$OpenBSD: Makefile,v 1.90 2003/04/17 03:48:56 drahn Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -114,12 +114,12 @@
 		LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \
 		LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/bin/ranlib \
 		SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
-		HOSTCC="${CC}" HOSTCXX="${CXX}" NOMAN= DESTDIR=${CROSSDIR} \
-		HOSTCFLAGS="${CFLAGS}" HOSTCXXFLAGS="${CXXFLAGS}" \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CROSSCFLAGS}" CPPFLAGS="${CROSSCPPFLAGS}" \
-		CXXFLAGS="${CROSSCXXFLAGS}" \
-		LDFLAGS="${CROSSLDFLAGS}"
+		HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= DESTDIR=${CROSSDIR} \
+		HOSTCFLAGS=\"${CFLAGS}\" HOSTCXXFLAGS=\"${CXXFLAGS}\" \
+		HOSTLDFLAGS=\"${LDFLAGS} \" \
+		CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \
+		CXXFLAGS=\"${CROSSCXXFLAGS}\" \
+		LDFLAGS=\"${CROSSLDFLAGS}\"
 CROSSPATH=	${PATH}:${CROSSDIR}/usr/bin
 CROSSLANGS?=	c c++
 
@@ -190,9 +190,9 @@
 	    ${MAKE} DESTDIR=${CROSSDIR} includes)
 	@touch ${CROSSINCLUDES}
 
-.if ${TARGET} == "alpha" || ${TARGET} == "hppa" || ${TARGET} == "macppc" || \
-    ${TARGET} == "mvmeppc" || ${TARGET} == "sgi" || ${TARGET} == "sparc" || \
-    ${TARGET} == "sparc64"
+.if ${TARGET} == "alpha" || ${TARGET} == "hppa" || ${TARGET} == "i386" || \
+    ${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || ${TARGET} == "sgi" || \
+    ${TARGET} == "sparc" || ${TARGET} == "sparc64"
 BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
 		strings strip
 NEW_BINUTILS?=	Yes
@@ -224,11 +224,12 @@
 	(cd ${.CURDIR}/gnu/usr.bin/ld; \
 	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOPIC= NOMAN= depend all; \
 	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
 	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= install)
+	    ${MAKE} NOPIC= NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ld \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ld
 	(cd ${.CURDIR}/usr.bin/ar; \