[pkgsrc/trunk]: pkgsrc/mk Work out _GCC_ARCHSUBDIR correctly, using the metho...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a376ecadc4cd
branches:  trunk
changeset: 461921:a376ecadc4cd
user:      gavan <gavan%pkgsrc.org@localhost>
date:      Tue Sep 23 19:19:33 2003 +0000

description:
Work out _GCC_ARCHSUBDIR correctly, using the method from
lang/gcc3/buildlink2.mk

diffstat:

 mk/compiler.mk |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r cfe7e8360110 -r a376ecadc4cd mk/compiler.mk
--- a/mk/compiler.mk    Tue Sep 23 19:05:21 2003 +0000
+++ b/mk/compiler.mk    Tue Sep 23 19:19:33 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.9 2003/09/21 16:43:47 wiz Exp $
+# $NetBSD: compiler.mk,v 1.10 2003/09/23 19:19:33 gavan Exp $
 
 # This Makefile fragment implements handling for supported
 # C/C++/fortran compilers.
@@ -110,7 +110,15 @@
 # we need to define these early, as they are used by gcc/buildlink2.mk.
 _GCC_SUBPREFIX=         gcc-2.95.3/
 _GCC_ARCHDIR=           ${_GCC_PREFIX}${_GCC_ARCHSUBDIR}
-_GCC_ARCHSUBDIR=        lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3
+_GCC_PREFIX=           ${LOCALBASE}/${_GCC_SUBPREFIX}
+_GCC_LIBGCCDIR!=                                               \
+  if [ -x ${_GCC_PREFIX}bin/gcc ]; then                                \
+    dirname `${_GCC_PREFIX}bin/gcc --print-libgcc-file-name`;  \
+  else                                                         \
+    ${ECHO} not-defined;                                       \
+  fi
+_GCC_ARCHSUBDIR= \
+  ${_GCC_LIBGCCDIR:S|^${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}||}
 
 .  if empty(USE_BUILDLINK2:M[nN][oO])
 .    include "../lang/gcc/buildlink2.mk"