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

Merge branch 'dev' of https://github.com/zerotier/zerotierone into dev

Browse Source
This commit is contained in:
Joseph Henry 2022-04-12 17:46:13 -07:00
commit 6cddb94509
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockerbuild/Dockerfile.alpine
View File

@ -1,4 +1,4 @@
FROM alpine:3.11.3 FROM alpine:3.15
ARG go_pkg_url ARG go_pkg_url

3
include/ZeroTierOne.h
View File

@ -1079,7 +1079,8 @@ enum ZT_Architecture
ZT_ARCHITECTURE_DOTNET_CLR = 13, ZT_ARCHITECTURE_DOTNET_CLR = 13,
ZT_ARCHITECTURE_JAVA_JVM = 14, ZT_ARCHITECTURE_JAVA_JVM = 14,
ZT_ARCHITECTURE_WEB = 15, ZT_ARCHITECTURE_WEB = 15,
ZT_ARCHITECTURE_S390X = 16 ZT_ARCHITECTURE_S390X = 16,
ZT_ARCHITECTURE_LOONGARCH64 = 17
}; };
/** /**

4
make-linux.mk
View File

@ -252,6 +252,10 @@ endif
ifeq ($(CC_MACH),riscv64) ifeq ($(CC_MACH),riscv64)
ZT_ARCHITECTURE=0 ZT_ARCHITECTURE=0
endif endif
ifeq ($(CC_MACH),loongarch64)
ZT_ARCHITECTURE=17
override DEFS+=-DZT_NO_TYPE_PUNNING
endif
# Fail if system architecture could not be determined # Fail if system architecture could not be determined
ifeq ($(ZT_ARCHITECTURE),999) ifeq ($(ZT_ARCHITECTURE),999)