diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-06-04 12:24:58 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-06-04 12:24:58 -0700 |
| commit | b9975845fffc087c138df4934831f9ef40e61ad6 (patch) | |
| tree | 40af34a6383d3a8d91797c8964f7ce041b2b4f52 /make-linux.mk | |
| parent | 91a22a686a17f8cedc58690592a84f5d4a3ab5e0 (diff) | |
| parent | b22405b64b0b26fa1d5d8932cf212e4ae7760632 (diff) | |
| download | infinitytier-b9975845fffc087c138df4934831f9ef40e61ad6.tar.gz infinitytier-b9975845fffc087c138df4934831f9ef40e61ad6.zip | |
Merge branch 'rtnetlink' into edge
Diffstat (limited to 'make-linux.mk')
| -rw-r--r-- | make-linux.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/make-linux.mk b/make-linux.mk index 749c24b8..b3a63f54 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -17,6 +17,10 @@ DESTDIR?= include objects.mk ONE_OBJS+=osdep/LinuxEthernetTap.o +ONE_OBJS+=osdep/LinuxNetLink.o + +NLTEST_OBJS+=osdep/LinuxNetLink.o node/InetAddress.o node/Utils.o node/Salsa20.o +NLTEST_OBJS+=nltest.o # Auto-detect miniupnpc and nat-pmp as well and use system libs if present, # otherwise build into binary as done on Mac and Windows. @@ -58,8 +62,8 @@ ifeq ($(ZT_SANITIZE),1) SANFLAGS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1 endif ifeq ($(ZT_DEBUG),1) - override CFLAGS+=-Wall -Wno-deprecated -Werror -g -pthread $(INCLUDES) $(DEFS) - override CXXFLAGS+=-Wall -Wno-deprecated -Werror -g -std=c++11 -pthread $(INCLUDES) $(DEFS) + override CFLAGS+=-Wall -Wno-deprecated -g -pthread $(INCLUDES) $(DEFS) + override CXXFLAGS+=-Wall -Wno-deprecated -g -std=c++11 -pthread $(INCLUDES) $(DEFS) ZT_TRACE=1 STRIP?=echo # The following line enables optimization for the crypto code, since @@ -315,6 +319,9 @@ debug: FORCE make ZT_DEBUG=1 one make ZT_DEBUG=1 selftest +nltest: $(NLTEST_OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o nltest $(NLTEST_OBJS) $(LDLIBS) + # Note: keep the symlinks in /var/lib/zerotier-one to the binaries since these # provide backward compatibility with old releases where the binaries actually # lived here. Folks got scripts. |