Skip to content
Permalink
Browse files

Synched C++ compiler detection.

Change-Id: I752b3dede1b56954f092c9ef5d623c1f1d375f73
  • Loading branch information...
svenpanne committed May 27, 2019
1 parent a0e0ba2 commit 014a07cef76d91f3fa864460a967b5f04fec51cf
@@ -23,7 +23,7 @@ else
endif

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

$(PYTHON_BUILD): $(PACKAGE_DIR)/$(PYTHON)/sitecustomize.pyc
$(TOUCH) $(PYTHON_BUILD)
@@ -29,7 +29,7 @@ B2_LINK_OPTION := "link=static"
$(BOOST_BUILD): $(PYTHON_BUILD) $(RE2_BUILD) $(BOOST_UNPACK)
# basically what part of AC_PROC_CXX does
@CXX="" ; \
for PROG in g++-8 clang++-7 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 \
for PROG in g++-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 ; \
@@ -37,7 +37,7 @@ $(DIR)/Makefile: $(DIR)/Makefile.in
#
#basically what part of AC_PROC_CXX does
@CXX="" ; \
for PROG in g++-8 clang++-7 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 \
for PROG in g++-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 ; \
@@ -17,7 +17,7 @@ $(RE2)-install:
$(RE2_BUILD): $(RE2_UNPACK)
# basically what part of AC_PROC_CXX does
@CXX="" ; \
for PROG in g++-8 clang++-7 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 \
for PROG in g++-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 ; \
@@ -27,7 +27,7 @@ ifneq ($(shell which g++-9 2>/dev/null),)
CXX := g++-9 -std=c++17
else ifneq ($(shell which clang++-8 2>/dev/null),)
CXX := clang++-8 -std=c++17
else ($(shell which g++-8 2>/dev/null),)
else ifneq ($(shell which g++-8 2>/dev/null),)
CXX := g++-8 -std=c++17
else ifneq ($(shell which clang++-7 2>/dev/null),)
CXX := clang++-7 -std=c++17

0 comments on commit 014a07c

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