pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Make build failures due to the previous commit less...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/525428894258
branches:  trunk
changeset: 512587:525428894258
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu May 11 22:13:19 2006 +0000

description:
Make build failures due to the previous commit less mysterious by using
a wrapper script that emits a hint of what went wrong.

diffstat:

 mk/compiler.mk |  19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 5caea82c82ac -r 525428894258 mk/compiler.mk
--- a/mk/compiler.mk    Thu May 11 21:51:40 2006 +0000
+++ b/mk/compiler.mk    Thu May 11 22:13:19 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.48 2006/05/06 15:20:05 tv Exp $
+# $NetBSD: compiler.mk,v 1.49 2006/05/11 22:13:19 jlam Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -150,12 +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}: fail-wrapper
+${_FAIL_WRAPPER.FC}: fail-wrapper
+
+.PHONY: fail-wrapper
+fail-wrapper: .USE
+       ${_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:=              ${FALSE}
+PKG_CXX:=              ${TOOLS_DIR}/bin/c++-fail-wrapper
 ALL_ENV+=              CXXCPP=${CPP:Q} # to make some Autoconf scripts happy
+override-tools: ${_FAIL_WRAPPER.CXX}
 .endif
 .if empty(USE_LANGUAGES:Mfortran)
-PKG_FC:=               ${FALSE}
+PKG_FC:=               ${TOOLS_DIR}/bin/fortran-fail-wrapper
+override-tools: ${_FAIL_WRAPPER.FC}
 .endif
 
 .endif # BSD_COMPILER_MK



Home | Main Index | Thread Index | Old Index