diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-10-19 10:06:06 -0500 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-10-19 10:06:06 -0500 |
| commit | 15d0aad3c0f68197f9d2158d68340fa46f661148 (patch) | |
| tree | bd2aa3c8da1938c0099d2e6495681fbb75fde91c | |
| parent | f0fc9b17660a67feaccbb94d7cc8e3739cd0cfa5 (diff) | |
| parent | 7c0331997a972cca58f8da3d3e7da9ba10b29b6a (diff) | |
| download | infinitytier-15d0aad3c0f68197f9d2158d68340fa46f661148.tar.gz infinitytier-15d0aad3c0f68197f9d2158d68340fa46f661148.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
| -rw-r--r-- | make-linux.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make-linux.mk b/make-linux.mk index 78ea98de..66a6376a 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -195,10 +195,10 @@ ifeq ($(CC_MACH),armv7l) override DEFS+=-DZT_NO_TYPE_PUNNING ZT_USE_ARM32_NEON_ASM_CRYPTO=1 endif -ifeq ($(CC_MACH),armv7l) - ZT_ARCHITECTURE=3 +ifeq ($(CC_MACH),armv7hl) + ZT_ARCHITECTURE=3 override DEFS+=-DZT_NO_TYPE_PUNNING - ZT_USE_ARM32_NEON_ASM_SALSA2012=1 + ZT_USE_ARM32_NEON_ASM_CRYPTO=1 endif ifeq ($(CC_MACH),arm64) ZT_ARCHITECTURE=4 |