github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 13:24:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'dev' into zeroidc

Browse source 
# Conflicts:
#	.gitignore
This commit is contained in:
Grant Limberg 2021-11-11 16:20:43 -08:00
commit b5186f7293
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
11 changed files with 129 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make-linux.mk
View file

@ -245,6 +245,16 @@ ERR=$(error FATAL: architecture could not be determined from $(CC) -dumpmachine:
err: ; $(ERR)
endif
# Flag for Intel 32-bit processors since some machine images are incorrectly marked as i386
ifeq ($(ZT_IA32),1)
override LDFLAGS+=-m32
override CFLAGS+=-m32
override CXXFLAGS+=-m32
# Prevent the use of X64 crypto
ZT_USE_X64_ASM_SALSA=0
ZT_USE_X64_ASM_ED25519=0
endif
# Disable software updates by default on Linux since that is normally done with package management
override DEFS+=-DZT_BUILD_PLATFORM=1 -DZT_BUILD_ARCHITECTURE=$(ZT_ARCHITECTURE) -DZT_SOFTWARE_UPDATE_DEFAULT="\"disable\""