github/natpass
4
0
Fork 0
mirror of https://github.com/lwch/natpass.git synced 2024-04-21 12:41:54 +00:00
Code Issues Projects Releases Wiki Activity

支持darwin跨平台编译

Browse Source
This commit is contained in:
lwch
2022-06-29 15:25:07 +08:00
parent 31a6af5bcd
commit efa340491d
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/build/Dockerfile
+1 -1
View File
@@ -3,7 +3,7 @@ ARG LIBPNG_VERSION=1.6.37
ARG GO_VERSION=1.18.3
ARG GO_PROXY=https://goproxy.cn,direct
FROM debian:stable-slim
FROM lwch/darwin-crosscompiler:11.3
ARG APT_MIRROR
ARG GO_VERSION
contrib/build/build_all.go
+8 -4
View File
@@ -37,13 +37,15 @@ type target struct {
var targets = []target{
// darwin
{
os: "darwin",
arch: "amd64",
os: "darwin",
arch: "amd64",
cc: "o64-clang", cxx: "o64-clang++",
packExt: ".tar.gz",
},
{
os: "darwin",
arch: "arm64",
os: "darwin",
arch: "arm64",
cc: "aarch64-apple-darwin20.4-clang", cxx: "aarch64-apple-darwin20.4-clang++",
packExt: ".tar.gz",
},
// linux
@@ -195,6 +197,8 @@ func build(t target) {
} else if t.os == "linux" && !strings.Contains(t.arch, "arm") {
env = append(env, "CGO_ENABLED=1")
ldflags += "-extldflags -static"
} else if t.os == "darwin" {
env = append(env, "CGO_ENABLED=1")
} else {
env = append(env, "CGO_ENABLED=0")
}
go.mod
+1 -1
View File
@@ -10,7 +10,7 @@ require (
github.com/kardianos/service v1.2.1
github.com/kisielk/errcheck v1.6.1 // indirect
github.com/lwch/logging v0.0.0-20220322084100-ec48185d95ab
github.com/lwch/rdesktop v1.0.1-0.20220628065908-dcf9d8e979b4
github.com/lwch/rdesktop v1.0.1-0.20220629063135-58d39f3500ea
github.com/lwch/runtime v0.0.0-20190520054850-8c97e19e0c6d
github.com/lwch/yaml v0.0.0-20211206085137-772f80e85a26
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
go.sum
+2
View File
@@ -23,6 +23,8 @@ github.com/lwch/rdesktop v1.0.1-0.20220628063626-7a6b7d0f55ed h1:dqhAvlOZjOp/GB7
github.com/lwch/rdesktop v1.0.1-0.20220628063626-7a6b7d0f55ed/go.mod h1:vZtkNUaG1bDuzJavu8OQQoBbHVS6cYJE7y4oxtmhYYM=
github.com/lwch/rdesktop v1.0.1-0.20220628065908-dcf9d8e979b4 h1:rqE8tCaMTAXrnY+cZJMFmAo7th6O9o4yQNXZdqJx6P4=
github.com/lwch/rdesktop v1.0.1-0.20220628065908-dcf9d8e979b4/go.mod h1:vZtkNUaG1bDuzJavu8OQQoBbHVS6cYJE7y4oxtmhYYM=
github.com/lwch/rdesktop v1.0.1-0.20220629063135-58d39f3500ea h1:z7jbWpsZizCvtmomETTo5Agrz9W2hfiaXHAiycgXdAg=
github.com/lwch/rdesktop v1.0.1-0.20220629063135-58d39f3500ea/go.mod h1:vZtkNUaG1bDuzJavu8OQQoBbHVS6cYJE7y4oxtmhYYM=
github.com/lwch/runtime v0.0.0-20190520054850-8c97e19e0c6d h1:Xg+zzPtvX22DaoJD5Bp0tqPdB8gn5WypghIJ4fluqiQ=
github.com/lwch/runtime v0.0.0-20190520054850-8c97e19e0c6d/go.mod h1:uEt0zu1MDC7WnVvodPBGSYAD/KMKk0v36xE8UE5veM8=
github.com/lwch/yaml v0.0.0-20211206085137-772f80e85a26 h1:sR3nbPhdfstDxYLp7c1EnsKH3z8+u+wgnhC3AI9/qf0=