Skip to content

Commit

Permalink
Detect more recent versions of GCC/Clang, too.
Browse files Browse the repository at this point in the history
Change-Id: I04fc98ff520b49ea6313c335d1c930ce95a995e6
  • Loading branch information
Sven Panne committed Aug 1, 2018
1 parent a13cfcc commit fa6cbb3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion omd/packages/boost/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; \
Expand Down
4 changes: 2 additions & 2 deletions omd/packages/python/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; \
Expand All @@ -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 ; \
Expand Down
2 changes: 1 addition & 1 deletion omd/packages/re2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ; \
Expand Down
6 changes: 5 additions & 1 deletion standalone.make
Original file line number Diff line number Diff line change
Expand Up @@ -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),)
Expand Down

0 comments on commit fa6cbb3

Please sign in to comment.