diff options
| author | joerg <joerg@pkgsrc.org> | 2011-07-19 14:02:47 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-07-19 14:02:47 +0000 |
| commit | 79d3366eacaaf6e792e950b36aa6c88fd14ff709 (patch) | |
| tree | 5d63d3d806afa1aa1a319c315c4a03633f0204ac /mk/compiler | |
| parent | 4d14310259842ab8ef4aec593be5c9032b88f263 (diff) | |
| download | pkgsrc-79d3366eacaaf6e792e950b36aa6c88fd14ff709.tar.gz | |
If the clang-cpp alias exists, use it as default CPP in pkgsrc.
Default to f2c for Fortran, mirroring gcc.
Append -Qunused-arguments in the wrappers to unbreak many stupid
configure checks that get confused by the (also added) -L options.
Diffstat (limited to 'mk/compiler')
| -rw-r--r-- | mk/compiler/clang.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/mk/compiler/clang.mk b/mk/compiler/clang.mk index 932c4a8c69c..f666ff821e6 100644 --- a/mk/compiler/clang.mk +++ b/mk/compiler/clang.mk @@ -1,4 +1,4 @@ -# $NetBSD: clang.mk,v 1.6 2010/12/26 14:09:01 asau Exp $ +# $NetBSD: clang.mk,v 1.7 2011/07/19 14:02:47 joerg Exp $ # # This is the compiler definition for the clang compiler. # @@ -34,6 +34,11 @@ CXXPATH= ${CLANGBASE}/bin/clang++ PKG_CXX:= ${CXXPATH} .endif +.if exists(${CLANGBASE}/bin/clang-cpp) +CPPPATH= ${CLANGBASE}/bin/clang-cpp +PKG_CPP:= ${CPPPATH} +.endif + .if exists(${CCPATH}) CC_VERSION_STRING!= ${CCPATH} -v 2>&1 CC_VERSION!= ${CCPATH} -dumpversion 2>&1 @@ -56,8 +61,13 @@ _LANGUAGES.clang= # empty _LANGUAGES.clang+= ${LANGUAGES.clang:M${_lang_}} .endfor -.if defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN) +PKGSRC_FORTRAN?=f2c + +.if !empty(PKGSRC_FORTRAN) . include "../../mk/compiler/${PKGSRC_FORTRAN}.mk" .endif +_WRAP_EXTRA_ARGS.CC+= -Qunused-arguments +_WRAP_EXTRA_ARGS.CXX+= -Qunused-arguments + .endif # COMPILER_CLANG_MK |