diff options
| author | Jakob P. Liljenberg <admin@qvantnet.com> | 2024-01-03 15:26:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-03 15:26:48 +0100 |
| commit | cabd91b8d21837b5361a533be3d659ad354ba03c (patch) | |
| tree | b8d4303a5ff14435bbcf66fb94436c486a904208 | |
| parent | 35672546536070931455214abf6c22e2e000fdbe (diff) | |
| parent | 85d75038e949e3aa07c9ca6c0544502b445981e1 (diff) | |
Merge pull request #613 from imwints/remove-compiler-check
| -rw-r--r-- | Makefile | 31 |
1 files changed, 3 insertions, 28 deletions
@@ -73,34 +73,9 @@ ifeq ($(CXX_IS_CLANG),true) ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt $(MIN_CLANG_VERSION); echo $$?),0) CLANG_WORKS := true endif -endif -ifeq ($(CLANG_WORKS),false) - #? Try to find a newer GCC version - 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 +else + ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt 10; echo $$?),0) + GCC_WORKS := true endif endif |