pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/compiler Adjust xlc_r check to actually look for th...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/afa01e211ef2
branches:  trunk
changeset: 550739:afa01e211ef2
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Nov 27 17:56:52 2008 +0000

description:
Adjust xlc_r check to actually look for the right binary.
Prefer xlc_r over cc_r as authoritive name. Export CC_R.
>From Jens Rehstack.

diffstat:

 mk/compiler/xlc.mk |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 4a0843620fc5 -r afa01e211ef2 mk/compiler/xlc.mk
--- a/mk/compiler/xlc.mk        Thu Nov 27 17:54:08 2008 +0000
+++ b/mk/compiler/xlc.mk        Thu Nov 27 17:56:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.18 2008/11/14 14:04:12 joerg Exp $
+# $NetBSD: xlc.mk,v 1.19 2008/11/27 17:56:52 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -82,12 +82,13 @@
 CXXPATH=               ${XLCBASE}/bin/xlc++
 PKG_CXX:=              ${_XLC_CXX}
 .endif
-.if exists(${XLCBASE}/bin/xlc)
+.if exists(${XLCBASE}/bin/xlc_r)
 _XLC_VARS+=            CC_R
-_XLC_CC_R=             ${_XLC_DIR}/bin/cc_r
+_XLC_CC_R=             ${_XLC_DIR}/bin/xlc_r
 _ALIASES.CC_R=         cc_r xlc_r
 CC_RPATH=              ${XLCBASE}/bin/xlc_r
 PKG_CC_R:=             ${_XLC_CC_R}
+CC_R?=                 cc_r
 .endif
 _COMPILER_STRIP_VARS+= ${_XLC_VARS}
 _COMPILER_RPATH_FLAG=  -Wl,-R



Home | Main Index | Thread Index | Old Index