[pkgsrc/trunk]: pkgsrc/mk Fix a problem that occurs if compiler.mk is include...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea4e8f098780
branches:  trunk
changeset: 512636:ea4e8f098780
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri May 12 21:37:08 2006 +0000

description:
Fix a problem that occurs if compiler.mk is included in a package's
Makefile, which means it occurs before bsd.tools.mk is included and
thus misses the definition of TOOLS_DIR.  We now create a new subdirectory
of ${WRKDIR} to house the wrappers instead of re-using ${TOOLS_DIR}.
Problem noted by Roland Illig on tech-pkg:

        http://mail-index.netbsd.org/tech-pkg/2006/05/12/0011.html

diffstat:

 mk/compiler.mk |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r a818bfd28061 -r ea4e8f098780 mk/compiler.mk
--- a/mk/compiler.mk    Fri May 12 21:13:31 2006 +0000
+++ b/mk/compiler.mk    Fri May 12 21:37:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.49 2006/05/11 22:13:19 jlam Exp $
+# $NetBSD: compiler.mk,v 1.50 2006/05/12 21:37:08 jlam Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -150,24 +150,25 @@
 # If the languages are not requested, force them not to be available
 # in the generated wrappers.
 #
-_FAIL_WRAPPER.CXX=     ${TOOLS_DIR}/bin/c++-fail-wrapper
-_FAIL_WRAPPER.FC=      ${TOOLS_DIR}/bin/fortran-fail-wrapper
+_FAIL_WRAPPER.CXX=     ${WRKDIR}/.compiler/bin/c++-fail-wrapper
+_FAIL_WRAPPER.FC=      ${WRKDIR}/.compiler/bin/fortran-fail-wrapper
 
 ${_FAIL_WRAPPER.CXX}: fail-wrapper
 ${_FAIL_WRAPPER.FC}: fail-wrapper
 
 .PHONY: fail-wrapper
 fail-wrapper: .USE
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${ECHO:Q}" 1>&2 \"===>\"; "${ECHO:Q}" 1>&2 \"===> Please add USE_LANGUAGES+="${.TARGET:T:S/-fail-wrapper//:Q}" to the package Makefile.\"; "${ECHO:Q}" 1>&2 
\"===>\"; exit 1" > ${.TARGET}
        ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
 
 .if empty(USE_LANGUAGES:Mc++)
-PKG_CXX:=              ${TOOLS_DIR}/bin/c++-fail-wrapper
+PKG_CXX:=              ${_FAIL_WRAPPER.CXX}
 ALL_ENV+=              CXXCPP=${CPP:Q} # to make some Autoconf scripts happy
 override-tools: ${_FAIL_WRAPPER.CXX}
 .endif
 .if empty(USE_LANGUAGES:Mfortran)
-PKG_FC:=               ${TOOLS_DIR}/bin/fortran-fail-wrapper
+PKG_FC:=               ${_FAIL_WRAPPER.FC}
 override-tools: ${_FAIL_WRAPPER.FC}
 .endif