From 38ef016225b0e1cb137f4b410319aeb69bbf0253 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sun, 20 Feb 2005 13:08:59 +0000
Subject: use the correct target for gcc and sunpro on solaris/x86.

---
 graphics/Mesa/Makefile.common | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'graphics')

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index b99d289db0a..6e616eb52cc 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2005/02/20 12:43:08 grant Exp $
+# $NetBSD: Makefile.common,v 1.39 2005/02/20 13:08:59 grant Exp $
 
 DISTNAME=	MesaLib-${MESA_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -32,19 +32,27 @@ INSTALLATION_DIRS+=	lib
 
 # Mesa has proper support for Solaris and SunPro, use it.
 .if ${OPSYS} == "SunOS"
-.  if ${MACHINE_ARCH} == "sparc" && !empty(CC_VERSION:MSun)
-.    if ${SPARC_TARGET_ARCH} == "sparcv7"
-BUILD_TARGET=             sunos5
-.    elif ${SPARC_TARGET_ARCH} == "sparcv8"
-BUILD_TARGET=             sunos5-v8
-.    elif ${SPARC_TARGET_ARCH} == "sparcv9"
-BUILD_TARGET=             sunos5-v9
+.  if ${MACHINE_ARCH} == "sparc"
+.    if !empty(CC_VERSION:MSun)
+.      if ${SPARC_TARGET_ARCH} == "sparcv7"
+BUILD_TARGET=		sunos5
+.      elif ${SPARC_TARGET_ARCH} == "sparcv8"
+BUILD_TARGET=		sunos5-v8
+.      elif ${SPARC_TARGET_ARCH} == "sparcv9"
+BUILD_TARGET=		sunos5-v9
+.      endif
+.    else
+BUILD_TARGET=		sunos5-gcc
+.    endif
+.  else	# i386
+.    if !empty(CC_VERSION:MSun)
+BUILD_TARGET=		solaris-x86
+.    else
+BUILD_TARGET=		solaris-x86-gcc
 .    endif
-.  else
-BUILD_TARGET=             sunos5-gcc
 .  endif
 .else
-BUILD_TARGET=             pkgsrc
+BUILD_TARGET=		pkgsrc
 .endif
 
 pre-install:
-- 
cgit v1.2.3