ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-21 13:57:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into zeroidc

Browse Source
This commit is contained in:
Grant Limberg 2021-12-01 16:59:06 -08:00
commit 8966002685
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/rules vendored
View File

@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
dh $@ --with systemd
override_dh_auto_build:
make -j4
make -j`nproc`
override_dh_systemd_start:
dh_systemd_start --restart-after-upgrade

4
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 -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
override CFLAGS+=-mfloat-abi=hard -march=armv6kz -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
override CXXFLAGS+=-mfloat-abi=hard -march=armv6kz -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s
ZT_USE_ARM32_NEON_ASM_CRYPTO=0
endif
endif