mirror of
https://github.com/aristocratos/btop.git
synced 2024-09-28 14:11:35 +02:00
Changed: Only look for g++-11 if CXX=g++
This commit is contained in:
parent
94feb4e16e
commit
3b4a7c12fc
14
Makefile
14
Makefile
@ -39,12 +39,14 @@ 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
|
||||||
ifneq ($(CXX),g++-10)
|
ifeq ($(CXX),g++)
|
||||||
V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
|
ifneq ($(CXX),g++-10)
|
||||||
ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
|
V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
|
||||||
ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
|
ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
|
||||||
override CXX := g++-11
|
ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
|
||||||
override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
|
override CXX := g++-11
|
||||||
|
override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user