From efa340491d7678cfd9a221bc2f47e71aa87e37d1 Mon Sep 17 00:00:00 2001
From: lwch <lwch748@gmail.com>
Date: Wed, 29 Jun 2022 15:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81darwin=E8=B7=A8=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contrib/build/Dockerfile   |  2 +-
 contrib/build/build_all.go | 12 ++++++++----
 go.mod                     |  2 +-
 go.sum                     |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/contrib/build/Dockerfile b/contrib/build/Dockerfile
index f18b5b7..ba2eda2 100644
--- a/contrib/build/Dockerfile
+++ b/contrib/build/Dockerfile
@@ -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
diff --git a/contrib/build/build_all.go b/contrib/build/build_all.go
index c55efc8..833e860 100644
--- a/contrib/build/build_all.go
+++ b/contrib/build/build_all.go
@@ -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")
 	}
diff --git a/go.mod b/go.mod
index 547079c..668d727 100644
--- a/go.mod
+++ b/go.mod
@@ -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
diff --git a/go.sum b/go.sum
index d09a45d..ceaabc8 100644
--- a/go.sum
+++ b/go.sum
@@ -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=