===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.33
retrieving revision 1.37
diff -u -r1.33 -r1.37
--- src/Makefile.cross	2010/08/25 08:04:01	1.33
+++ src/Makefile.cross	2010/09/20 11:49:39	1.37
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.33 2010/08/25 08:04:01 jsg Exp $
+# $OpenBSD: Makefile.cross,v 1.37 2010/09/20 11:49:39 syuu Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -16,7 +16,7 @@
 .elif	(${TARGET} == "aviion" || ${TARGET} == "luna88k" || \
 	 ${TARGET} == "mvme88k")
 TARGET_ARCH=	m88k
-.elif	(${TARGET} == "sgi")
+.elif	(${TARGET} == "sgi" || ${TARGET} == "octeon")
 TARGET_ARCH=	mips64
 .elif	(${TARGET} == "loongson")
 TARGET_ARCH=	mips64el
@@ -78,9 +78,9 @@
     ${TARGET_ARCH} == "sparc" || ${TARGET_ARCH} == "vax"
 TARGET_USE_GCC3=No
 COMPILER_VERSION=gcc2
-.elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "hppa" || \
-    ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_ARCH} == "sparc64"
+.elif ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "hppa" || \
+    ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" || \
+    ${TARGET_ARCH} == "sparc64"
 TARGET_USE_GCC4=Yes
 COMPILER_VERSION=gcc4
 .else
@@ -99,6 +99,7 @@
 NO_CROSS+=httpd
 NO_CROSS+=microcode
 NO_CROSS+=groff lynx binutils perl texinfo gcc cvs
+NO_CROSS+=nsd
 
 cross-dirs:	${CROSSDIRS}
 cross-obj:	${CROSSOBJ}