diff options
| author | he <[email protected]> | 2020-09-06 11:48:51 +0800 |
|---|---|---|
| committer | he <[email protected]> | 2020-09-06 11:48:51 +0800 |
| commit | 4b53f2df9ecbc9cbd59c4b36a26648bd91002daa (patch) | |
| tree | 3dd0ecd224e0b6afa50767cfaedfaa0b56b5717a | |
| parent | 304cd31298a66501aecec161c31f5e94aa5ac142 (diff) | |
Improve the architecture judgment under Linux
| -rw-r--r-- | core/makefile | 2 | ||||
| -rw-r--r-- | makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/makefile b/core/makefile index 46c0d313b..31b3b9026 100644 --- a/core/makefile +++ b/core/makefile @@ -169,7 +169,7 @@ ARCH :=$(if $(findstring windows,$(PLAT)),x86,$(ARCH)) ARCH :=$(if $(findstring msys,$(PLAT)),$(MSYSARCH),$(ARCH)) ARCH :=$(if $(findstring cygwin,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) ARCH :=$(if $(findstring macosx,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) -ARCH :=$(if $(findstring linux,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) +ARCH :=$(if $(findstring linux,$(PLAT)),$(shell uname -m),$(ARCH)) ARCH :=$(if $(findstring bsd,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) ARCH :=$(if $(findstring iphoneos,$(PLAT)),armv7,$(ARCH)) ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(ARCH)) @@ -43,7 +43,7 @@ ARCH :=$(if $(findstring windows,$(PLAT)),x86,$(ARCH)) ARCH :=$(if $(findstring msys,$(PLAT)),$(MSYSARCH),$(ARCH)) ARCH :=$(if $(findstring cygwin,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) ARCH :=$(if $(findstring macosx,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) -ARCH :=$(if $(findstring linux,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) +ARCH :=$(if $(findstring linux,$(PLAT)),$(shell uname -m),$(ARCH)) ARCH :=$(if $(findstring bsd,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) ARCH :=$(if $(findstring iphoneos,$(PLAT)),armv7,$(ARCH)) ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(ARCH)) |