[pkgsrc/trunk]: pkgsrc/mk/compiler Don't recompute _GCC_PREFIX and _GCC_SUBPR...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28b391e80421
branches:  trunk
changeset: 649378:28b391e80421
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Apr 02 23:21:01 2015 +0000

description:
Don't recompute _GCC_PREFIX and _GCC_SUBPREFIX in the general case.  At
best this does nothing, and at worst it is actively harmful when using
multilib systems.  It's possible the mips case is broken too, but I do
not have any hardware to test that on, so for now leave the special mips
MABIFLAG handling intact.

Fixes multilib SunOS builds.

diffstat:

 mk/compiler/gcc.mk |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (19 lines):

diff -r 21003f65ab43 -r 28b391e80421 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Thu Apr 02 23:14:36 2015 +0000
+++ b/mk/compiler/gcc.mk        Thu Apr 02 23:21:01 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.155 2015/02/04 14:11:50 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.156 2015/04/02 23:21:01 jperkin Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -668,9 +668,6 @@
 .    if defined(MABIFLAG) && !empty(MABIFLAG)
 _GCC_PREFIX:=          ${_GCC_ARCHDIR:H:H:H:H:H}/
 _GCC_SUBPREFIX:=       ${_GCC_ARCHDIR:H:H:H:H:H:T}/
-.    else
-_GCC_PREFIX:=          ${_GCC_ARCHDIR:H:H:H:H}/
-_GCC_SUBPREFIX:=       ${_GCC_ARCHDIR:H:H:H:H:T}/
 .    endif
 .  endif
 _GCC_LIBDIRS=  ${_GCC_ARCHDIR} ${_GCC_PREFIX}lib