[pkgsrc/trunk]: pkgsrc/mk/compiler Use CCPATH instead of referring to the C c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e1f670165c4
branches:  trunk
changeset: 484020:7e1f670165c4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 23 05:32:22 2004 +0000

description:
Use CCPATH instead of referring to the C compiler by its full path in
multiple places.

diffstat:

 mk/compiler/ccc.mk     |   8 ++++----
 mk/compiler/gcc.mk     |  10 +++++-----
 mk/compiler/mipspro.mk |   8 ++++----
 mk/compiler/sunpro.mk  |   8 ++++----
 mk/compiler/xlc.mk     |   6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)

diffs (112 lines):

diff -r b60f003d1092 -r 7e1f670165c4 mk/compiler/ccc.mk
--- a/mk/compiler/ccc.mk        Tue Nov 23 05:24:28 2004 +0000
+++ b/mk/compiler/ccc.mk        Tue Nov 23 05:32:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ccc.mk,v 1.4 2004/11/23 05:24:28 jlam Exp $
+# $NetBSD: ccc.mk,v 1.5 2004/11/23 05:32:22 jlam Exp $
 
 .if !defined(COMPILER_CCC_MK)
 COMPILER_CCC_MK=       defined
@@ -37,9 +37,9 @@
 CXXPATH=       /usr/bin/cxx
 .endif
 
-.if exists(/usr/bin/cc) && !defined(CC_VERSION_STRING)
-CC_VERSION_STRING!=    /usr/bin/cc -V 2>&1 | awk '{print; exit(0);}'
-CC_VERSION!=           /usr/bin/cc -V 2>&1 | awk '{print "CCC-"$3; exit(0);}'
+.if exists(${CCPATH}) && !defined(CC_VERSION_STRING)
+CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 | awk '{print; exit(0);}'
+CC_VERSION!=           ${CCPATH} -V 2>&1 | awk '{print "CCC-"$3; exit(0);}'
 .else
 CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           CCC
diff -r b60f003d1092 -r 7e1f670165c4 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Tue Nov 23 05:24:28 2004 +0000
+++ b/mk/compiler/gcc.mk        Tue Nov 23 05:32:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.75 2004/11/23 00:46:26 dmcmahill Exp $
+# $NetBSD: gcc.mk,v 1.76 2004/11/23 05:32:22 jlam Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=       defined
@@ -377,11 +377,11 @@
 .endif
 
 .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
-.  if exists(${_GCCBINDIR}/gcc)
-CC_VERSION_STRING!=    ${_GCCBINDIR}/gcc -v 2>&1
+.  if exists(${CCPATH})
+CC_VERSION_STRING!=    ${CCPATH} -v 2>&1
 CC_VERSION!=           \
-       if ${_GCCBINDIR}/gcc -dumpversion > /dev/null 2>&1; then        \
-               ${ECHO} "gcc-`${_GCCBINDIR}/gcc -dumpversion`";         \
+       if ${CCPATH} -dumpversion > /dev/null 2>&1; then                \
+               ${ECHO} "gcc-`${CCPATH} -dumpversion`";                 \
        else                                                            \
                ${ECHO} "gcc-${_GCC_REQD}";                             \
        fi
diff -r b60f003d1092 -r 7e1f670165c4 mk/compiler/mipspro.mk
--- a/mk/compiler/mipspro.mk    Tue Nov 23 05:24:28 2004 +0000
+++ b/mk/compiler/mipspro.mk    Tue Nov 23 05:32:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.27 2004/11/23 00:46:26 dmcmahill Exp $
+# $NetBSD: mipspro.mk,v 1.28 2004/11/23 05:32:22 jlam Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=   defined
@@ -34,10 +34,10 @@
 CXXPATH=               ${MIPSPROBASE}/bin/CC
 .endif
 
-.if exists(${MIPSPROBASE}/bin/cc)
+.if exists(${CCPATH})
 # MIPSpro Compilers: Version 7.3.1.2m
-CC_VERSION_STRING!=    ${MIPSPROBASE}/bin/cc -version 2>&1 || ${TRUE}
-CC_VERSION!=           ${MIPSPROBASE}/bin/cc -version 2>&1 | ${GREP} '^MIPSpro'
+CC_VERSION_STRING!=    ${CCPATH} -version 2>&1 || ${TRUE}
+CC_VERSION!=           ${CCPATH} -version 2>&1 | ${GREP} '^MIPSpro'
 .else
 CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           MIPSpro Compilers
diff -r b60f003d1092 -r 7e1f670165c4 mk/compiler/sunpro.mk
--- a/mk/compiler/sunpro.mk     Tue Nov 23 05:24:28 2004 +0000
+++ b/mk/compiler/sunpro.mk     Tue Nov 23 05:32:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.23 2004/11/23 00:46:26 dmcmahill Exp $
+# $NetBSD: sunpro.mk,v 1.24 2004/11/23 05:32:22 jlam Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=    defined
@@ -43,9 +43,9 @@
 # SunPro compiler must be passed certain flags to compile/link 64-bit code.
 _COMPILER_ABI_FLAG.64= -xtarget=ultra -xarch=v9
 
-.if exists(${SUNWSPROBASE}/bin/cc)
-CC_VERSION_STRING!=    ${SUNWSPROBASE}/bin/cc -V 2>&1 || ${TRUE}
-CC_VERSION!=           ${SUNWSPROBASE}/bin/cc -V 2>&1 | ${GREP} '^cc'
+.if exists(${CCPATH})
+CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 || ${TRUE}
+CC_VERSION!=           ${CCPATH} -V 2>&1 | ${GREP} '^cc'
 .else
 CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           cc: Sun C
diff -r b60f003d1092 -r 7e1f670165c4 mk/compiler/xlc.mk
--- a/mk/compiler/xlc.mk        Tue Nov 23 05:24:28 2004 +0000
+++ b/mk/compiler/xlc.mk        Tue Nov 23 05:32:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.4 2004/11/23 05:24:28 jlam Exp $
+# $NetBSD: xlc.mk,v 1.5 2004/11/23 05:32:22 jlam Exp $
 
 .if !defined(COMPILER_XLC_MK)
 COMPILER_XLC_MK=       defined
@@ -34,8 +34,8 @@
 CXXPATH=       ${XLCBASE}/bin/xlc++
 .endif
 
-.if exists(${XLCBASE}/bin/xlc)
-CC_VERSION_STRING!=    ${XLCBASE}/bin/xlc -V 2>&1 | ${GREP} 'IBM XL C.*for' | ${SED} -e 's/^ *//' || ${TRUE}
+.if exists(${CCPATH})
+CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 | ${GREP} 'IBM XL C.*for' | ${SED} -e 's/^ *//' || ${TRUE}
 CC_VERSION=            ${CC_VERSION_STRING}
 .else
 CC_VERSION_STRING?=    ${CC_VERSION}