mirror of https://github.com/aristocratos/btop.git
Changed: Only look for g++-11 if CXX=g++
This commit is contained in:
parent
94feb4e16e
commit
3b4a7c12fc
2
Makefile
2
Makefile
|
@ -39,6 +39,7 @@ CXX ?= g++
|
||||||
override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
|
override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
|
||||||
|
|
||||||
#? Try to make sure we are using GCC/G++ version 11 or later if not instructed to use g++-10
|
#? Try to make sure we are using GCC/G++ version 11 or later if not instructed to use g++-10
|
||||||
|
ifeq ($(CXX),g++)
|
||||||
ifneq ($(CXX),g++-10)
|
ifneq ($(CXX),g++-10)
|
||||||
V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
|
V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
|
||||||
ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
|
ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
|
||||||
|
@ -48,6 +49,7 @@ ifneq ($(CXX),g++-10)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
#? Pull in platform specific source files and get thread count
|
#? Pull in platform specific source files and get thread count
|
||||||
ifeq ($(PLATFORM),Linux)
|
ifeq ($(PLATFORM),Linux)
|
||||||
|
|
Loading…
Reference in New Issue