mirror of
https://github.com/aristocratos/btop.git
synced 2024-09-29 08:41:19 +13:00
Merge pull request #613 from imwints/remove-compiler-check
This commit is contained in:
commit
cabd91b8d2
1 changed files with 3 additions and 28 deletions
25
Makefile
25
Makefile
|
@ -73,36 +73,11 @@ 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
|
|
||||||
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
|
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)
|
ifneq ($(shell test $(CXX_VERSION_MAJOR) -lt 10; echo $$?),0)
|
||||||
GCC_WORKS := true
|
GCC_WORKS := true
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CLANG_WORKS),false)
|
ifeq ($(CLANG_WORKS),false)
|
||||||
ifeq ($(GCC_WORKS),false)
|
ifeq ($(GCC_WORKS),false)
|
||||||
|
|
Loading…
Reference in a new issue