[checkmk-commits] Detect more recent C/C++ compilers.

Module: check_mk Branch: master Commit: 14d3b148681981bf0ec4cb93ec3863aae79fb92f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14d3b148681981… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 10:48:23 2017 +0200 Detect more recent C/C++ compilers. Change-Id: Ib342beb08e3197e4b189e0a87395c2fb5b844538 --- configure.ac | 4 ++-- omd/packages/boost/Makefile | 2 +- omd/packages/python/Makefile | 4 ++-- standalone.make | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 44ef454..11d4498 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-6 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang]) +AC_PROG_CC([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]) 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++-6 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++]) +AC_PROG_CXX([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++]) AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) AC_PROG_RANLIB # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it. :-P diff --git a/omd/packages/boost/Makefile b/omd/packages/boost/Makefile index 733d3f7..42cf8c4 100644 --- a/omd/packages/boost/Makefile +++ b/omd/packages/boost/Makefile @@ -24,7 +24,7 @@ build: check-python tar xzf $(NAME)_$(VERSION).tar.gz # basically what part of AC_PROC_CXX does @CXX="" ; \ - for PROG in 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++-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 \ 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 cf0bcba..fa8b1c6 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -38,7 +38,7 @@ build: bin/gcc bin/g++ # The compiler detection code below is basically what part of AC_PROC_CXX does. bin/gcc: @CC="" ; \ - for PROG in 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-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 \ echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ for DIR in $$PATH; do \ IFS=$$SAVED_IFS ; \ @@ -55,7 +55,7 @@ bin/gcc: bin/g++: @CXX="" ; \ - for PROG in 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++-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 \ 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 188f996..a90bd61 100644 --- a/standalone.make +++ b/standalone.make @@ -23,7 +23,9 @@ # Boston, MA 02110-1301 USA. # TODO(sp) We should really use autotools here... -ifneq ($(shell which g++-6 2>/dev/null),) +ifneq ($(shell which g++-7 2>/dev/null),) + CXX := g++-7 -std=c++14 +else ifneq ($(shell which g++-6 2>/dev/null),) CXX := g++-6 -std=c++14 else CXX := g++-5 -std=c++14