pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Restore c++ support in ccache.mk
details: https://anonhg.NetBSD.org/pkgsrc/rev/96320c5ebced
branches: trunk
changeset: 363465:96320c5ebced
user: kamil <kamil%pkgsrc.org@localhost>
date: Sat Jun 10 11:32:32 2017 +0000
description:
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>
diffstat:
mk/compiler.mk | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diffs (30 lines):
diff -r 5d258b3f8427 -r 96320c5ebced mk/compiler.mk
--- a/mk/compiler.mk Sat Jun 10 11:10:42 2017 +0000
+++ b/mk/compiler.mk Sat Jun 10 11:32:32 2017 +0000
@@ -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
.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 @@
_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}
Home |
Main Index |
Thread Index |
Old Index