Module: check_mk Branch: master Commit: 8d63b21fb6748c982dd0652de341344c4be97de7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d63b21fb6748c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 1 11:25:48 2018 +0200 Detect more recent versions of GCC/Clang, too. Change-Id: I04fc98ff520b49ea6313c335d1c930ce95a995e6 --- configure.ac | 4 ++-- omd/packages/boost/Makefile | 2 +- omd/packages/python/Makefile | 4 ++-- omd/packages/re2/Makefile | 2 +- standalone.make | 6 +++++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 6ff8253..26faf37 100644 --- a/configure.ac +++ b/configure.ac @@ -49,12 +49,12 @@ AS_IF([test "x$enable_rrd_is_thread_safe" != "xno"], [RRDLIB_TO_CHECK=rrd], [RRDLIB_TO_CHECK=rrd_th]) # Checks for programs. -AC_PROG_CC([gcc-7 clang-5.0 gcc clang]) +AC_PROG_CC([gcc-8 gcc-7 clang-6.0 clang-5.0 gcc clang]) AC_PROG_CC_C99([], []) if test "x$ac_cv_prog_cc_c99" = xno; then AC_MSG_ERROR([Need a C99-compliant C compiler]) fi -AC_PROG_CXX([g++-7 clang++-5.0 g++ clang++]) +AC_PROG_CXX([g++-8 g++-7 clang++-6.0 clang++-5.0 g++ clang++]) AC_DEFINE_UNQUOTED([BUILD_CXX], ["`$CXX --version | head -n1`"], [C++ compiler]) AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) AC_PROG_RANLIB diff --git a/omd/packages/boost/Makefile b/omd/packages/boost/Makefile index d5cc223..2beb316 100644 --- a/omd/packages/boost/Makefile +++ b/omd/packages/boost/Makefile @@ -23,7 +23,7 @@ build: check-python tar xzf $(NAME)_$(VERSION).tar.gz # basically what part of AC_PROC_CXX does @CXX="" ; \ - for PROG in g++-7 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ + for PROG in g++-8 g++-7 clang++-6.0 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ for DIR in $$PATH; do \ IFS=$$SAVED_IFS ; \ diff --git a/omd/packages/python/Makefile b/omd/packages/python/Makefile index 7297e3b..b2fe9db 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -51,7 +51,7 @@ sitecustomize.pyc: sitecustomize.py # The compiler detection code below is basically what part of AC_PROC_CXX does. bin/gcc: @CC="" ; \ - for PROG in gcc-7 clang-5.0 gcc-6 clang-4.0 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang; do \ + for PROG in gcc-8 gcc-7 clang-6.0 clang-5.0 gcc-6 clang-4.0 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang; do \ echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ for DIR in $$PATH; do \ IFS=$$SAVED_IFS ; \ @@ -68,7 +68,7 @@ bin/gcc: bin/g++: @CXX="" ; \ - for PROG in g++-7 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ + for PROG in g++-8 g++-7 clang++-6.0 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ for DIR in $$PATH; do \ IFS=$$SAVED_IFS ; \ diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index 427d7de..7665be9 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -12,7 +12,7 @@ DIR = $(NAME)-$(VERSION) build: unpack # basically what part of AC_PROC_CXX does @CXX="" ; \ - for PROG in g++-7 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ + for PROG in g++-8 g++-7 clang++-6.0 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ for DIR in $$PATH; do \ IFS=$$SAVED_IFS ; \ diff --git a/standalone.make b/standalone.make index e547a9a..1a7771e 100644 --- a/standalone.make +++ b/standalone.make @@ -23,8 +23,12 @@ # Boston, MA 02110-1301 USA. # TODO(sp) We should really use autotools here... -ifneq ($(shell which g++-7 2>/dev/null),) +ifneq ($(shell which g++-8 2>/dev/null),) + CXX := g++-8 -std=c++17 +else ifneq ($(shell which g++-7 2>/dev/null),) CXX := g++-7 -std=c++17 +else ifneq ($(shell which clang++-6.0 2>/dev/null),) + CXX := clang++-6.0 -std=c++17 else ifneq ($(shell which clang++-5.0 2>/dev/null),) CXX := clang++-5.0 -std=c++17 else ifneq ($(shell which g++ 2>/dev/null),)