diff options
| author | ruki <[email protected]> | 2020-02-26 22:49:57 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-02-26 10:59:44 +0800 |
| commit | 1cfb98b4e65d73ccddcb396a510f1ffa9d1f28ac (patch) | |
| tree | a428af1defd84244b35cdc556d607a9a473c4b11 /makefile | |
| parent | 33183c28a74286f34d81b228c91b616af17a1db7 (diff) | |
readlink from programfile
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -45,6 +45,10 @@ 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 iphoneos,$(PLAT)),armv7,$(ARCH)) ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(ARCH)) +ARCH :=$(if $(findstring any,$(ARCH)),i386,$(ARCH)) # from msys/PKGBUILD +ARCH :=$(if $(findstring i686,$(ARCH)),i386,$(ARCH)) # from msys/mingw32 +ARCH :=$(if $(findstring x32,$(ARCH)),i386,$(ARCH)) +ARCH :=$(if $(findstring x64,$(ARCH)),x86_64,$(ARCH)) # for arm linux? ifeq ($(PLAT),linux) @@ -55,10 +59,6 @@ ARCH := $(if $(findstring armv7,$(ARCHSTR)),armv7,$(ARCH)) ARCH := $(if $(findstring arm,$(ARCHSTR)),arm,$(ARCH)) endif endif -ARCH :=$(if $(findstring any,$(ARCH)),i386,$(ARCH)) # from msys/PKGBUILD -ARCH :=$(if $(findstring i686,$(ARCH)),i386,$(ARCH)) # from msys/mingw32 -ARCH :=$(if $(findstring x32,$(ARCH)),i386,$(ARCH)) -ARCH :=$(if $(findstring x64,$(ARCH)),x86_64,$(ARCH)) # conditionally map ARCH from amd64 to x86_64 if set from the outside # |