Module: check_mk
Branch: master
Commit: 343d11dd7af6470221c4a79183ec4f804ab3340f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=343d11dd7af647…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Nov 8 13:56:23 2018 +0100
Bump Clang tooling to version 7.
Change-Id: I65627b8607bf78b30ab99b5e76b83b983828acd1
---
Makefile | 12 ++++++------
livestatus/src/Makefile.am | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index ef46cf4..a81b910 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ TAROPTS := --owner=root --group=root --exclude=.svn
--exclude=*~ \
--exclude=.gitignore --exclude=*.swp --exclude=.f12
# We could add clang's -Wshorten-64-to-32 and g++'c/clang's -Wsign-conversion
here.
CXX_FLAGS := -g -O3 -Wall -Wextra
-CLANG_VERSION := 6.0
+CLANG_VERSION := 7
CLANG_FORMAT := clang-format-$(CLANG_VERSION)
CLANG_TIDY := clang-tidy-$(CLANG_VERSION)
export RUN_CLANG_TIDY := run-clang-tidy-$(CLANG_VERSION).py
@@ -349,18 +349,18 @@ setup:
autoconf \
bear \
build-essential \
- clang-6.0 \
- clang-format-6.0 \
- clang-tidy-6.0 \
+ clang-7 \
+ clang-format-7 \
+ clang-tidy-7 \
doxygen \
figlet \
g++ \
libboost-dev \
libboost-system-dev \
- libclang-6.0-dev \
+ libclang-7-dev \
libpcap-dev \
librrd-dev \
- llvm-6.0-dev \
+ llvm-7-dev \
libsasl2-dev \
pngcrush \
slimit \
diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am
index 445de40..6f7cc24 100644
--- a/livestatus/src/Makefile.am
+++ b/livestatus/src/Makefile.am
@@ -22,7 +22,7 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-CLANG_VERSION ?= 6.0
+CLANG_VERSION ?= 7
BEAR ?= bear
CPPCHECK ?= cppcheck