github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-14 10:37:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into edge

Browse source
This commit is contained in:
Adam Ierymenko 2019-09-05 11:06:27 -07:00
commit 70648d006d
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
attic/make-linux.mk
View file

@ -1,4 +1,4 @@
# Automagically pick clang or gcc, with preference for clang
# Automagically pick CLANG or RH/CentOS newer GCC if present
# This is only done if we have not overridden these with an environment or CLI variable
ifeq ($(origin CC),default)
CC:=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi)
@ -18,9 +18,6 @@ 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
# for central controller builds
TIMESTAMP=$(shell date +"%Y%m%d%H%M")
@ -344,9 +341,6 @@ 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.