[pkgsrc/trunk]: pkgsrc/graphics/Mesa use the correct target for gcc and sunpr...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/023135993919
branches:  trunk
changeset: 489382:023135993919
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Feb 20 13:08:59 2005 +0000

description:
use the correct target for gcc and sunpro on solaris/x86.

diffstat:

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

diffs (47 lines):

diff -r bb0f423cb433 -r 023135993919 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common     Sun Feb 20 13:02:28 2005 +0000
+++ b/graphics/Mesa/Makefile.common     Sun Feb 20 13:08:59 2005 +0000
@@ -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 @@
 
 # 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
-BUILD_TARGET=             sunos5-gcc
+.  else        # i386
+.    if !empty(CC_VERSION:MSun)
+BUILD_TARGET=          solaris-x86
+.    else
+BUILD_TARGET=          solaris-x86-gcc
+.    endif
 .  endif
 .else
-BUILD_TARGET=             pkgsrc
+BUILD_TARGET=          pkgsrc
 .endif
 
 pre-install: