Skip to content

Commit

Permalink
Simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
rui314 committed Jan 3, 2022
1 parent 9894b31 commit 5029a6d
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ STRIP ?= strip
OS ?= $(shell uname -s)
ARCH ?= $(shell uname -m)

IS_ANDROID = 0
ifneq ($(findstring -android,$(shell $(CC) -dumpmachine)),)
IS_ANDROID = 1
endif

# Used for both C and C++
COMMON_FLAGS = -pthread -fPIE -fno-unwind-tables -fno-asynchronous-unwind-tables

Expand Down Expand Up @@ -60,10 +65,8 @@ endif
USE_MIMALLOC = 1
ifeq ($(OS), Darwin)
USE_MIMALLOC = 0
else ifeq ($(OS), Linux)
ifeq ($(shell uname -o), Android)
USE_MIMALLOC = 0
endif
else ifeq ($(IS_ANDROID), 1)
USE_MIMALLOC = 0
else ifeq ($(ASAN), 1)
USE_MIMALLOC = 0
else ifeq ($(TSAN), 1)
Expand Down

0 comments on commit 5029a6d

Please sign in to comment.