summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjoerg <joerg>2008-11-27 17:56:52 +0000
committerjoerg <joerg>2008-11-27 17:56:52 +0000
commitf9e7034a0873f00d3d6db12938935564114ed2e2 (patch)
treeff9d9de9b43e5b094445fd0c5c1a04e2de4dc8c0 /mk
parent089c92fdf3010f2987d59197f931ffdc34b6b553 (diff)
downloadpkgsrc-f9e7034a0873f00d3d6db12938935564114ed2e2.tar.gz
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 (limited to 'mk')
-rw-r--r--mk/compiler/xlc.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk
index 920726c9117..9cbaff10eba 100644
--- a/mk/compiler/xlc.mk
+++ b/mk/compiler/xlc.mk
@@ -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 @@ _ALIASES.CXX= c++ xlc++
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