From 143a2d8ee687c8d167904efc386065ec48a2a50b Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sun, 13 Jul 2003 06:44:02 +0000
Subject: when creating the buildinfo file, set CC=${CC} without the version
 information, and set CC_VERSION appropriately by trying -v and -V args.

works for gcc2, gcc3 and SunPro, may need tweaking for MIPSPro.
---
 mk/bsd.pkg.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 41a23be7f1d..8c2e2f2d6f4 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1213 2003/07/12 15:34:37 wiz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1214 2003/07/13 06:44:02 grant Exp $
 #
 # This file is in the public domain.
 #
@@ -4206,8 +4206,11 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE}
 .  for def in ${BUILD_DEFS}
 	@${ECHO} ${def}=${${def}:Q} | ${SED} -e 's|^PATH=[^ 	]*|PATH=...|' >> ${BUILD_INFO_FILE}
 .  endfor
-	@if ${CC} -dumpversion >/dev/null 2>&1; then \
-	  ${ECHO} "CC=${CC}-`${CC} -dumpversion`" >> ${BUILD_INFO_FILE}; \
+	@${ECHO} "CC=${CC}" >> ${BUILD_INFO_FILE}
+	@if ${CC} -v 2>&1 | ${GREP} -q '^gcc'; then \
+	  ${ECHO} "CC_VERSION=`${CC} -v 2>&1 | ${GREP} '^gcc'`" >> ${BUILD_INFO_FILE}; \
+	elif ${CC} -V 2>&1 | ${GREP} -q '^cc'; then \
+	  ${ECHO} "CC_VERSION=`${CC} -V 2>&1 | ${GREP} '^cc'`" >> ${BUILD_INFO_FILE}; \
 	fi
 .  if defined(USE_PERL5) && (${USE_PERL5} == "run")
 	@${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${BUILD_INFO_FILE}
-- 
cgit v1.2.3