summaryrefslogtreecommitdiff
path: root/make-linux.mk
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-06-01 19:43:06 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-06-01 19:43:06 -0700
commita9a390a930493bba3b64a20fb20e55f304062b0a (patch)
tree04de7ea5092800ad4ec05383676284b6ac875025 /make-linux.mk
parentd7344871e6b8edee9f6a9cbaa3bb924429d8abcb (diff)
downloadinfinitytier-a9a390a930493bba3b64a20fb20e55f304062b0a.tar.gz
infinitytier-a9a390a930493bba3b64a20fb20e55f304062b0a.zip
Apply @marning suggested SSE auto-detect to make builds easier on non-x86 platforms: https://github.com/mwarning/ZeroTierOne/commit/aa2fd044cb69b97eef1ea38d5fefd18543aae22a
Diffstat (limited to 'make-linux.mk')
-rw-r--r--make-linux.mk21
1 files changed, 0 insertions, 21 deletions
diff --git a/make-linux.mk b/make-linux.mk
index 6b92bfaa..892b40b6 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -9,27 +9,6 @@ LIBS=
include objects.mk
OBJS+=osdep/LinuxEthernetTap.o
-# Enable SSE-optimized Salsa20 on x86 and x86_64 machines
-MACHINE=$(shell uname -m)
-ifeq ($(MACHINE),x86_64)
- DEFS+=-DZT_SALSA20_SSE
-endif
-ifeq ($(MACHINE),amd64)
- DEFS+=-DZT_SALSA20_SSE
-endif
-ifeq ($(MACHINE),i686)
- DEFS+=-DZT_SALSA20_SSE
-endif
-ifeq ($(MACHINE),i586)
- DEFS+=-DZT_SALSA20_SSE
-endif
-ifeq ($(MACHINE),i386)
- DEFS+=-DZT_SALSA20_SSE
-endif
-ifeq ($(MACHINE),x86)
- DEFS+=-DZT_SALSA20_SSE
-endif
-
# "make official" is a shortcut for this
ifeq ($(ZT_OFFICIAL_RELEASE),1)
ZT_AUTO_UPDATE=1