CVS commit: pkgsrc/mk

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sat Jun 10 11:32:32 UTC 2017

Modified Files:
        pkgsrc/mk: compiler.mk

Log Message:
Restore c++ support in ccache.mk

The ccache.mk file was checking for languages "c" and "c++".
New framework for C++ dialects (or revisions) was setting implicitly c++,
translating e.g. c++11 to c++.

compiler.mk set this c++ after including ccache.mk, so c++ was undefined
and ccache was ignored.

This helps to build large projects like LLVM+Clang+LLDB with ccache.

Sponsored by <The NetBSD Foundation>


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/mk/compiler.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler.mk
diff -u pkgsrc/mk/compiler.mk:1.85 pkgsrc/mk/compiler.mk:1.86
--- pkgsrc/mk/compiler.mk:1.85  Thu May 18 08:14:08 2017
+++ pkgsrc/mk/compiler.mk       Sat Jun 10 11:32:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.85 2017/05/18 08:14:08 jperkin Exp $
+# $NetBSD: compiler.mk,v 1.86 2017/06/10 11:32:32 kamil Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -78,6 +78,12 @@ USE_LANGUAGES?=      c
 USE_LANGUAGES+=        c
 .endif
 
+.for _version_ in gnu++14 c++14 gnu++11 c++11 gnu++0x c++0x
+.  if !empty(USE_LANGUAGES:M${_version_})
+USE_LANGUAGES+=                c++
+.  endif
+.endfor
+
 COMPILER_USE_SYMLINKS?=        yes
 
 _COMPILERS=            ccc gcc icc ido mipspro mipspro-ucode \
@@ -168,7 +174,6 @@ ${_var_}:=  ${${_var_}:C/^/_asdf_/1:M_asd
 _CXX_VERSION_REQD=
 .for _version_ in gnu++14 c++14 gnu++11 c++11 gnu++0x c++0x
 .  if empty(_CXX_VERSION_REQD) && !empty(USE_LANGUAGES:M${_version_})
-USE_LANGUAGES+=                c++
 _CXX_VERSION_REQD=     ${_version_}
 _WRAP_EXTRA_ARGS.CXX+= -std=${_CXX_VERSION_REQD}
 CWRAPPERS_PREPEND.cxx+=        -std=${_CXX_VERSION_REQD}