From 99c8ad18e303c3f3ae0690172db8cebb7d94c4f8 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Thu, 30 May 2002 19:46:34 +0000
Subject: Ignore a c++ that is version other than 3.1 if it does not also match
 cc's version.  libgcc.a will have been clobbered and will no longer have the
 old c++ support.

Submitted by:	jhb
---
 Makefile.inc1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 5df999d..ff55a00 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -574,7 +574,10 @@ _strfile=	games/fortune/strfile
 .endif
 # This horrible kludge should be deleted in about 2 weeks, say July 9, 2002
 _cxx_version!=	${CXX} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}'
-.if ${CXX:T} != "c++" || ${_cxx_version} != "3.1" || exists(/usr/lib/libstdc++.so.4)
+_cc_version!=  ${CC} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}'
+.if ${CXX:T} != "c++" || \
+    (${_cxx_version} == ${_cc_version} && ${_cxx_version} != "3.1") || \
+    exists(/usr/lib/libstdc++.so.4)
 _cxx_consumers=	gnu/usr.bin/gperf gnu/usr.bin/groff
 .endif
 
-- 
cgit v1.1