CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-18 19:33:03 +12:00
Code Issues Projects Releases Wiki Activity

Merge 1eb2b69a8e into 3b65b3a729

Browse source
This commit is contained in:
Laurent Cheylus 2024-04-30 17:22:11 +02:00 committed by GitHub
parent 3b65b3a729 1eb2b69a8e
commit 717589cacf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -91,10 +91,13 @@ $(error $(shell printf "\033[1;91mERROR: \033[97mCompiler too old. (Requires Cla
endif
#? Any flags added to TESTFLAGS must not contain whitespace for the testing to work
override TESTFLAGS := -fexceptions -fstack-clash-protection -fcf-protection
override TESTFLAGS := -fexceptions -fcf-protection
ifneq ($(PLATFORM) $(ARCH),macos arm64)
override TESTFLAGS += -fstack-protector
endif
ifneq ($(PLATFORM_LC) $(CXX_IS_CLANG),openbsd true)
override TESTFLAGS += -fstack-clash-protection
endif
ifeq ($(STATIC),true)
ifeq ($(CXX_IS_CLANG) $(CLANG_WORKS),true true)
@ -143,7 +146,11 @@ else ifeq ($(PLATFORM_LC),macos)
else ifeq ($(PLATFORM_LC),openbsd)
PLATFORM_DIR := openbsd
THREADS := $(shell sysctl -n hw.ncpu || echo 1)
override ADDFLAGS += -lkvm -static-libstdc++
ifeq ($(CXX_IS_CLANG) $(CLANG_WORKS),true true)
override LDFLAGS += -lkvm
else
override ADDFLAGS += -lkvm -static-libstdc++
endif
export MAKE = gmake
SU_GROUP := wheel
else