[src/trunk]: src/external/cddl/osnet/lib/libdtrace Use the correct MACHINE_AR...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/49de30c77c4e
branches:  trunk
changeset: 773692:49de30c77c4e
user:      wiz <wiz%NetBSD.org@localhost>
date:      Mon Feb 13 12:52:54 2012 +0000

description:
Use the correct MACHINE_ARCH for amd64.
Remove temporary hack while here.
>From Henning Petersen in PR 46001.

diffstat:

 external/cddl/osnet/lib/libdtrace/Makefile |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r c29786806df9 -r 49de30c77c4e external/cddl/osnet/lib/libdtrace/Makefile
--- a/external/cddl/osnet/lib/libdtrace/Makefile        Mon Feb 13 12:49:35 2012 +0000
+++ b/external/cddl/osnet/lib/libdtrace/Makefile        Mon Feb 13 12:52:54 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2010/04/03 18:34:19 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2012/02/13 12:52:54 wiz Exp $
 
 # $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -82,13 +82,10 @@
 COPTS.dt_provider.c    += -Wno-stack-protector
 COPTS.dt_subr.c                += -Wno-stack-protector
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .elif ${MACHINE_ARCH} == "sparc64"
 CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
-.else
-# temporary hack
-CPPFLAGS+=     -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
 
 LFLAGS+=-l