Remove detailed compiler check

Currently the Makefile tries to pick the latest version of g++ and
overrides CXX when found.

Since we give an error if the version of the compiler is not sufficient,
we can remove this check.

It's now possible to specify an older version (on purpose) and new
compiler version don't need to be added manually.
This commit is contained in:
Steffen Winter 2023-09-13 23:17:06 +02:00
parent 3567254653
commit 85d75038e9
No known key found for this signature in database
GPG Key ID: 358DE931C6399F58
1 changed files with 3 additions and 28 deletions

View File

@ -73,34 +73,9 @@ ifeq ($(CXX_IS_CLANG),true)
ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt $(MIN_CLANG_VERSION); echo $$?),0) ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt $(MIN_CLANG_VERSION); echo $$?),0)
CLANG_WORKS := true CLANG_WORKS := true
endif endif
endif else
ifeq ($(CLANG_WORKS),false) ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt 10; echo $$?),0)
#? Try to find a newer GCC version GCC_WORKS := true
ifeq ($(shell command -v g++-13 >/dev/null; echo $$?),0)
CXX := g++-13
else ifeq ($(shell command -v g++13 >/dev/null; echo $$?),0)
CXX := g++13
else ifeq ($(shell command -v g++-12 >/dev/null; echo $$?),0)
CXX := g++-12
else ifeq ($(shell command -v g++12 >/dev/null; echo $$?),0)
CXX := g++12
else ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
CXX := g++-11
else ifeq ($(shell command -v g++11 >/dev/null; echo $$?),0)
CXX := g++11
else ifeq ($(shell command -v g++ >/dev/null; echo $$?),0)
CXX := g++
else ifeq ($(shell command -v eg++ >/dev/null; echo $$?),0)
CXX := eg++
else
GCC_NOT_FOUND := true
endif
ifndef GCC_NOT_FOUND
override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
override CXX_VERSION_MAJOR := $(shell echo $(CXX_VERSION) | cut -d '.' -f 1)
ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt 10; echo $$?),0)
GCC_WORKS := true
endif
endif endif
endif endif