ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-31 00:23:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ZT_SANITIZE flag handling in Linux makefile

Browse Source
This commit is contained in:
Joseph Henry 2021-03-08 15:11:55 -08:00
parent a5a94e3c49
commit 315a5cfd58
No known key found for this signature in database
GPG Key ID: C45B33FF5EBC9344
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
make-linux.mk
View File

@ -45,10 +45,6 @@ endif
# Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
ONE_OBJS+=ext/http-parser/http_parser.o ONE_OBJS+=ext/http-parser/http_parser.o
# Build with address sanitization library for advanced debugging (clang)
ifeq ($(ZT_SANITIZE),1)
DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
endif
ifeq ($(ZT_DEBUG_TRACE),1) ifeq ($(ZT_DEBUG_TRACE),1)
DEFS+=-DZT_DEBUG_TRACE DEFS+=-DZT_DEBUG_TRACE
endif endif
@ -62,7 +58,7 @@ endif
# Build with address sanitization library for advanced debugging (clang) # Build with address sanitization library for advanced debugging (clang)
ifeq ($(ZT_SANITIZE),1) ifeq ($(ZT_SANITIZE),1)
SANFLAGS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1 override DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
endif endif
ifeq ($(ZT_DEBUG),1) ifeq ($(ZT_DEBUG),1)
override CFLAGS+=-Wall -Wno-deprecated -g -O -pthread $(INCLUDES) $(DEFS) override CFLAGS+=-Wall -Wno-deprecated -g -O -pthread $(INCLUDES) $(DEFS)
@ -408,7 +404,7 @@ uninstall: FORCE
# These are just for convenience for building Linux packages # These are just for convenience for building Linux packages
debian: FORCE debian: FORCE
debuild --no-lintian -I -i -us -uc -nc -b debuild --no-lintian -I -i -us -uc -nc -b
debian-clean: FORCE debian-clean: FORCE
rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp