Skip to content
Permalink
Browse files

Detect Clang 9, too.

Change-Id: Ib3229630128d0734c550b73e76402b42b63bc349
  • Loading branch information
svenpanne committed Nov 28, 2019
1 parent acc594c commit cf6ded4baf263b5caad495638a80fbe11b7ec035
Showing with 7 additions and 5 deletions.
  1. +2 −2 configure.ac
  2. +2 −2 omd/packages/Python/Python.make
  3. +1 −1 omd/packages/re2/re2.make
  4. +2 −0 standalone.make
@@ -37,12 +37,12 @@ AC_REQUIRE_AUX_FILE([config.guess])
AC_REQUIRE_AUX_FILE([config.sub])

# Checks for programs.
AC_PROG_CC([gcc-9 clang-8 gcc-8 clang-7 gcc-7 clang-6.0 clang-5.0 gcc clang])
AC_PROG_CC([gcc-9 clang-9 clang-8 gcc-8 clang-7 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++-9 clang++-8 g++-8 clang++-7 g++-7 clang++-6.0 clang++-5.0 g++ clang++])
AC_PROG_CXX([g++-9 clang++-9 clang++-8 g++-8 clang++-7 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
@@ -36,8 +36,8 @@ PYTHON_TMP_BIN_DIR := $(PYTHON_WORK_DIR)/python-bin
# $(PYTHON_TMP_BIN_DIR)/gcc and $(PYTHON_TMP_BIN_DIR)/g++
PYTHON_TMP_BIN_PATH_VAR := PATH="$(PYTHON_TMP_BIN_DIR):$$PATH"

PYTHON_CC_COMPILERS = gcc-9 clang-8 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
PYTHON_CXX_COMPILERS := g++-9 clang++-8 g++-8 clang++-7 g++-7 clang++-6.0 clang++-5.0 g++ clang++
PYTHON_CC_COMPILERS = gcc-9 clang-9 clang-8 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
PYTHON_CXX_COMPILERS := g++-9 clang++-9 clang++-8 g++-8 clang++-7 g++-7 clang++-6.0 clang++-5.0 g++ clang++

.PHONY: Python Python-install Python-skel Python-clean upstream

@@ -25,7 +25,7 @@ $(RE2)-install:
$(RE2_BUILD): $(RE2_UNPACK)
# basically what part of AC_PROC_CXX does
@CXX="" ; \
for PROG in g++-9 clang++-8 g++-8 clang++-7 g++-7 clang++-6.0 clang++-5.0 g++ clang++; do \
for PROG in g++-9 clang++-9 clang++-8 g++-8 clang++-7 g++-7 clang++-6.0 clang++-5.0 g++ clang++; do \
echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \
for DIR in $$PATH; do \
IFS=$$SAVED_IFS ; \
@@ -25,6 +25,8 @@
# TODO(sp) We should really use autotools here...
ifneq ($(shell which g++-9 2>/dev/null),)
CXX := g++-9 -std=c++17
else ifneq ($(shell which clang++-9 2>/dev/null),)
CXX := clang++-9 -std=c++17
else ifneq ($(shell which clang++-8 2>/dev/null),)
CXX := clang++-8 -std=c++17
else ifneq ($(shell which g++-8 2>/dev/null),)

0 comments on commit cf6ded4

Please sign in to comment.
You can’t perform that action at this time.