diff options
| author | Sergey Avseyev <sergey.avseyev@gmail.com> | 2017-11-16 04:36:36 +0300 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-11-16 02:36:36 +0100 |
| commit | 0d81ada619f5f251274007b6cb5b16010e9f9632 (patch) | |
| tree | 6bff7e4f89d3283abd3622c2ac2b3c6dc698ebb9 /tools/niminst | |
| parent | 39c304f8822b350472d584f72ca8f220bde20f7f (diff) | |
| download | Nim-0d81ada619f5f251274007b6cb5b16010e9f9632.tar.gz | |
Fix platform detection in makefile (#6751)
Diffstat (limited to 'tools/niminst')
| -rw-r--r-- | tools/niminst/makefile.tmpl | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tools/niminst/makefile.tmpl b/tools/niminst/makefile.tmpl index bf4fd5cd0..fa96117b8 100644 --- a/tools/niminst/makefile.tmpl +++ b/tools/niminst/makefile.tmpl @@ -17,7 +17,6 @@ endif ucpu := $(shell sh -c 'uname -m | tr "[:upper:]" "[:lower:]"') uos := $(shell sh -c 'uname | tr "[:upper:]" "[:lower:]"') -uosname := $(shell sh -c 'uname -o | tr "[:upper:]" "[:lower:]"') ifeq ($(uos),linux) myos = linux @@ -65,15 +64,10 @@ endif ifeq ($(uos),haiku) myos = haiku endif -ifndef uos +ifndef myos $(error unknown operating system: $(uos)) endif -ifeq ($(uosname),android) - myos = android - LINK_FLAGS += -landroid-glob -endif - ifeq ($(ucpu),i386) mycpu = i386 endif @@ -141,7 +135,16 @@ endif ifeq ($(ucpu),armv6l) mycpu = arm endif -ifndef ucpu +ifeq ($(ucpu),armv7l) + mycpu = arm +endif +ifeq ($(ucpu),armv7hl) + mycpu = arm +endif +ifeq ($(ucpu),aarch64) + mycpu = arm64 +endif +ifndef mycpu $(error unknown processor: $(ucpu)) endif |