From ac1b6aab47c17319b76df6e5959cc5f4c33b97cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=BCnter?= Date: Sun, 17 Oct 2021 01:02:37 +0200 Subject: [PATCH] adopting review comments https://github.com/aristocratos/btop/pull/92#discussion_r730320662 https://github.com/aristocratos/btop/pull/92#discussion_r730320819 --- Makefile | 9 +-------- README.md | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 1bfd42a..e580ee0 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index 3cd230f..1730fad 100644 --- a/README.md +++ b/README.md @@ -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=` to manually set the target architectur. + Append `ARCH=` 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.