diff options
| author | ruki <[email protected]> | 2020-09-14 22:54:42 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-09-14 22:54:42 +0800 |
| commit | 2458b7dfefdcbe7c39b4590467e3cf6c96f8ef00 (patch) | |
| tree | b0b2a4266cc80ee8e2191c28c0d9a96b86040f72 | |
| parent | 0df7778b25a5d53e4e35c88d27ca593fa7e2439d (diff) | |
fix makefile
| -rw-r--r-- | core/makefile | 9 | ||||
| -rw-r--r-- | makefile | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/core/makefile b/core/makefile index 591f63510..e423b0c5c 100644 --- a/core/makefile +++ b/core/makefile @@ -184,10 +184,11 @@ endif endif # translate architecture, e.g. armhf/armv7l -> arm, arm64-v8a -> arm64 -ARCH := $(if $(findstring aarch64,$(ARCH)),arm64,$(ARCH)) -ARCH := $(if $(findstring arm64,$(ARCH)),arm64,$(ARCH)) -ARCH := $(if $(findstring arm,$(ARCH)),arm,$(ARCH)) -ARCH := $(if $(findstring i686,$(ARCH)),i386,$(ARCH)) +ARCHSTR := $(ARCH) +ARCH := $(if $(findstring aarch64,$(ARCHSTR)),arm64,$(ARCH)) +ARCH := $(if $(findstring arm64,$(ARCHSTR)),arm64,$(ARCH)) +ARCH := $(if $(findstring arm,$(ARCHSTR)),arm,$(ARCH)) +ARCH := $(if $(findstring i686,$(ARCHSTR)),i386,$(ARCH)) # debug DEBUG :=$(if $(DEBUG),$(DEBUG),n) @@ -58,10 +58,11 @@ endif endif # translate architecture, e.g. armhf/armv7l -> arm, arm64-v8a -> arm64 -ARCH := $(if $(findstring aarch64,$(ARCH)),arm64,$(ARCH)) -ARCH := $(if $(findstring arm64,$(ARCH)),arm64,$(ARCH)) -ARCH := $(if $(findstring arm,$(ARCH)),arm,$(ARCH)) -ARCH := $(if $(findstring i686,$(ARCH)),i386,$(ARCH)) +ARCHSTR := $(ARCH) +ARCH := $(if $(findstring aarch64,$(ARCHSTR)),arm64,$(ARCH)) +ARCH := $(if $(findstring arm64,$(ARCHSTR)),arm64,$(ARCH)) +ARCH := $(if $(findstring arm,$(ARCHSTR)),arm,$(ARCH)) +ARCH := $(if $(findstring i686,$(ARCHSTR)),i386,$(ARCH)) # conditionally map ARCH from amd64 to x86_64 if set from the outside # |