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

adopting review comments

Browse source 
https://github.com/aristocratos/btop/pull/92#discussion_r730320662
https://github.com/aristocratos/btop/pull/92#discussion_r730320819
This commit is contained in:
Jan Günter 2021-10-17 01:02:37 +02:00
parent d3c85dad21
commit ac1b6aab47
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -33,13 +33,6 @@ ifeq ($(STRIP),true)
override ADDFLAGS += -s
endif
#? Make sure PLATFORM Darwin is OSX and not Darwin
ifeq ($(PLATFORM_LC),darwin)
ifeq ($(shell sw_vers >/dev/null 2>&1; echo $$?),0)
PLATFORM := OSX
endif
endif
#? Compiler and Linker
CXX ?= g++
override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
@ -62,7 +55,7 @@ ifeq ($(PLATFORM_LC),linux)
else ifeq ($(PLATFORM_LC),freebsd)
PLATFORM_DIR := freebsd
THREADS := $(shell getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
else ifeq ($(PLATFORM_LC),osx)
else ifeq ($(PLATFORM_LC),apple)
PLATFORM_DIR := osx
THREADS := $(shell sysctl -n hw.ncpu || echo 1)
else

2
README.md
View file

@ -261,7 +261,7 @@ Also needs a UTF8 locale and a font that covers:
Append `STRIP=true` to force stripping of debug symbols (adds `-s` linker flag).
Append `ARCH=<architecture>` to manually set the target architectur.
Append `ARCH=<architecture>` to manually set the target architecture.
If omitted the makefile uses the machine triple (output of `-dumpmachine` compiler parameter) to detect the target system.
Use `ADDFLAGS` variable for appending flags to both compiler and linker.