From ff389f044d3a4328aa36a17264367c4a62058773 Mon Sep 17 00:00:00 2001
From: schwarz <schwarz@pkgsrc.org>
Date: Sun, 6 Aug 2006 18:59:41 +0000
Subject: CPP on IRIX 5 with IDO cc is /usr/lib/cpp

---
 mk/compiler/ido.mk                                 | 11 +++++++++--
 pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk |  7 ++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/mk/compiler/ido.mk b/mk/compiler/ido.mk
index 6c2e08f3cd5..1e33d6b2d44 100644
--- a/mk/compiler/ido.mk
+++ b/mk/compiler/ido.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ido.mk,v 1.2 2005/10/30 10:33:23 schwarz Exp $
+# $NetBSD: ido.mk,v 1.3 2006/08/06 18:59:41 schwarz Exp $
 
 .if !defined(COMPILER_IDO_MK)
 COMPILER_IDO_MK=	defined
@@ -22,6 +22,13 @@ _ALIASES.CC=		cc
 CCPATH=			${IDOBASE}/bin/cc
 PKG_CC:=		${_IDO_CC}
 .endif
+.if exists(${IDOBASE}/lib/cpp)
+_IDO_VARS+=		CPP
+_IDO_CPP=		${_IDO_DIR}/bin/cpp
+_ALIASES.CPP=		cpp
+CPPPATH=		${IDOBASE}/lib/cpp
+PKG_CPP:=		${_IDO_CPP}
+.endif
 _COMPILER_STRIP_VARS+=	${_IDO_VARS}
 
 CC_VERSION?=		${LOWER_OPSYS} ido cc
@@ -53,7 +60,7 @@ ${_IDO_${_var_}}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
-	 ${ECHO} 'exec ${IDOBASE}/bin/${.TARGET:T} "$$@"';		\
+	 ${ECHO} 'exec ${${_var_}PATH} "$$@"';			\
 	) > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
diff --git a/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk
index 65bb989eb94..a0760fb899b 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: IRIX.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#	$NetBSD: IRIX.sys.mk,v 1.2 2006/08/06 18:59:41 schwarz Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run Unix
@@ -37,7 +37,12 @@ OBJCFLAGS?=	${CFLAGS}
 COMPILE.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
 LINK.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
+_IRIXVERS!=	uname -r
+.if !empty(_IRIXVERS:M6*)
 CPP?=		CC -E
+.else
+CPP?=		cpp
+.endif
 CPPFLAGS?=	
 
 FC?=		f77
-- 
cgit v1.2.3