[pkgsrc/trunk]: pkgsrc CPP on IRIX 5 with IDO cc is /usr/lib/cpp

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fec48cead761
branches:  trunk
changeset: 517229:fec48cead761
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sun Aug 06 18:59:41 2006 +0000

description:
CPP on IRIX 5 with IDO cc is /usr/lib/cpp

diffstat:

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

diffs (54 lines):

diff -r 5287738f340a -r fec48cead761 mk/compiler/ido.mk
--- a/mk/compiler/ido.mk        Sun Aug 06 18:55:46 2006 +0000
+++ b/mk/compiler/ido.mk        Sun Aug 06 18:59:41 2006 +0000
@@ -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 @@
 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 @@
        ${_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 -r 5287738f340a -r fec48cead761 pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk
--- a/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk        Sun Aug 06 18:55:46 2006 +0000
+++ b/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk        Sun Aug 06 18:59:41 2006 +0000
@@ -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 @@
 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