summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-08-18 14:00:35 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-08-18 14:00:35 -0700
commitbab5647522ef42dc60bc17165c70ab78405b1434 (patch)
tree45a024410023dd142120b538cdd799adf05b0c90
parentfcaf1d89c260943d3c9c4021b9ab6fe89c1c4de8 (diff)
downloadinfinitytier-bab5647522ef42dc60bc17165c70ab78405b1434.tar.gz
infinitytier-bab5647522ef42dc60bc17165c70ab78405b1434.zip
Add make rule for official-static.
-rw-r--r--make-linux.mk9
1 files changed, 3 insertions, 6 deletions
diff --git a/make-linux.mk b/make-linux.mk
index 7017d31e..3ae2d4fd 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -210,12 +210,6 @@ endif
all: one
-#ext/x64-salsa2012-asm/salsa2012.o:
-# $(CC) -c ext/x64-salsa2012-asm/salsa2012.s -o ext/x64-salsa2012-asm/salsa2012.o
-
-#ext/arm32-neon-salsa2012-asm/salsa2012.o:
-# $(CC) -c ext/arm32-neon-salsa2012-asm/salsa2012.s -o ext/arm32-neon-salsa2012-asm/salsa2012.o
-
one: $(CORE_OBJS) $(ONE_OBJS) one.o
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LDLIBS)
$(STRIP) zerotier-one
@@ -252,6 +246,9 @@ distclean: clean
realclean: distclean
+official-static: FORCE
+ make -j4 ZT_STATIC=1 LDLIBS=/usr/lib/libjemalloc.a all selftest
+
debug: FORCE
make ZT_DEBUG=1 one
make ZT_DEBUG=1 selftest