diff options
| author | ruki <[email protected]> | 2020-02-28 22:58:23 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-02-28 11:50:23 +0800 |
| commit | 9fe4b550970a66fbfebff7c97baf7ef418dd0c8d (patch) | |
| tree | 50e708b8cc30d96d88b44ba59b67c44ec501dd7b /core/makefile | |
| parent | 75e37c2f401c6547b417b157d7666dee293101e7 (diff) | |
fix makefile for termux/ci
Diffstat (limited to 'core/makefile')
| -rw-r--r-- | core/makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/makefile b/core/makefile index 5105a95d3..c777aea70 100644 --- a/core/makefile +++ b/core/makefile @@ -176,11 +176,16 @@ ARCH :=$(if $(findstring x64,$(ARCH)),x86_64,$(ARCH)) # for arm linux? ifeq ($(PLAT),linux) -ARCHSTR := $(shell uname -m) +ifneq ($(TERMUX_ARCH),) +ARCHSTR := $(TERMUX_ARCH) # on termux/ci +else +ARCHSTR := $(shell uname -m) # on arm device, e.g. termux app +endif ARCH := $(if $(findstring aarch64,$(ARCHSTR)),arm64,$(ARCH)) ARCH := $(if $(findstring arm64,$(ARCHSTR)),arm64,$(ARCH)) ARCH := $(if $(findstring armv7,$(ARCHSTR)),armv7,$(ARCH)) ARCH := $(if $(findstring arm,$(ARCHSTR)),arm,$(ARCH)) +ARCH := $(if $(findstring i686,$(ARCHSTR)),i386,$(ARCH)) endif endif @@ -279,8 +284,12 @@ base_LIBPATH := base_LIBNAMES := base_LIBNAMES += $(shell if { cat detect/curses.c | $(CC) -xc - -lcurses -ltinfo -o /dev/null 2>/dev/null; }; then echo curses tinfo; fi ) base_LIBNAMES += $(shell if { cat detect/readline.c | $(CC) -xc - -lreadline -o /dev/null 2>/dev/null; }; then echo readline; fi ) +ifneq ($(TERMUX_ARCH),) # on termux/ci? +base_LIBNAMES += m dl +else base_LIBNAMES += m dl pthread endif +endif # check jit compiler ifeq ($(PLAT),linux) |