From e1a1da00f64cd21f15ea890c5bd104a52ca0f8e7 Mon Sep 17 00:00:00 2001
From: sbd <sbd@pkgsrc.org>
Date: Mon, 16 Apr 2012 05:00:44 +0000
Subject: Make sure that gcc47 JAVA_WRAPPERS don't break the _GCC_SUBPREFIX
 detection.

---
 mk/compiler/gcc.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 6ef48e36046..bbd26d87ade 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.116 2012/04/13 03:03:36 sbd Exp $
+# $NetBSD: gcc.mk,v 1.117 2012/04/16 05:00:44 sbd Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -474,6 +474,7 @@ _GCC_SUBPREFIX!=	\
 	if ${PKG_INFO} -qe ${_GCC_PKGBASE}; then			\
 		${PKG_INFO} -f ${_GCC_PKGBASE} |			\
 		${GREP} "File:.*bin/gcc" |				\
+		${GREP} -v "/gcc[0-9][0-9]*-.*" |			\
 		${SED} -e "s/.*File: *//;s/bin\/gcc.*//;q";		\
 	else								\
 		case ${_CC} in						\
-- 
cgit v1.2.3