github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-19 21:03:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into zeroidc

Browse source
This commit is contained in:
Grant Limberg 2021-11-30 18:42:45 -08:00
commit ca8d315924
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
4 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make-linux.mk
View file

@ -286,8 +286,8 @@ ifeq ($(ZT_ARCHITECTURE),3)
override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
else
override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -mcpu=arm1176jzf-s -marm -mno-unaligned-access
override CXXFLAGS+=-mfloat-abi=hard -mfpu=vfp -mcpu=arm1176jzf-s -fexceptions -marm -mno-unaligned-access
override CFLAGS+=-mfloat-abi=hard -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -mstructure-size-boundary=8 -marm -mno-unaligned-access
override CXXFLAGS+=-mfloat-abi=hard -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -fexceptions -mstructure-size-boundary=8 -marm -mno-unaligned-access
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif
endif
@ -348,7 +348,7 @@ distclean: clean
realclean: distclean
official: FORCE
make -j4 ZT_OFFICIAL=1 all
make -j`nproc` ZT_OFFICIAL=1 all
docker: FORCE
docker build --no-cache -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized .