From 9c2bf2f28fe56a74758ee14efe33cbca6a781d8b Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 11 Dec 2017 22:42:38 +0800 Subject: improve makefile for arch detect --- core/makefile | 1 + makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/core/makefile b/core/makefile index 252fc852a..cf14faee7 100644 --- a/core/makefile +++ b/core/makefile @@ -170,6 +170,7 @@ ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(ARCH)) ifeq ($(PLAT),linux) ARCHSTR := $(shell uname -m) 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)) endif diff --git a/makefile b/makefile index 9d987f015..743636566 100644 --- a/makefile +++ b/makefile @@ -32,6 +32,7 @@ ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(ARCH)) ifeq ($(PLAT),linux) ARCHSTR := $(shell uname -m) 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)) endif -- cgit v1.3.1