TUN-6767: Build ICMP proxy for Windows only when CGO is enabled

chungthuang · chungthuang · commit e454994e3ed3 · 2022-09-16T10:14:05.000+01:00
diff --git a/ingress/icmp_generic.go b/ingress/icmp_generic.go
@@ -1,4 +1,4 @@
-//go:build !darwin && !linux && !windows
+//go:build !darwin && !linux && (!windows || !cgo)
 
 package ingress
 
@@ -14,7 +14,7 @@ import (
 	"github.com/cloudflare/cloudflared/packet"
 )
 
-var errICMPProxyNotImplemented = fmt.Errorf("ICMP proxy is not implemented on %s", runtime.GOOS)
+var errICMPProxyNotImplemented = fmt.Errorf("ICMP proxy is not implemented on %s %s", runtime.GOOS, runtime.GOARCH)
 
 type icmpProxy struct{}
 
diff --git a/ingress/icmp_windows.go b/ingress/icmp_windows.go
@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && cgo
 
 package ingress
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build !darwin && !linux && !windows`
	`1`	`+//go:build !darwin && !linux && (!windows \|\| !cgo)`
`2`	`2`
`3`	`3`	`package ingress`
`4`	`4`
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"github.com/cloudflare/cloudflared/packet"`
`15`	`15`	`)`
`16`	`16`
`17`		`-var errICMPProxyNotImplemented = fmt.Errorf("ICMP proxy is not implemented on %s", runtime.GOOS)`
	`17`	`+var errICMPProxyNotImplemented = fmt.Errorf("ICMP proxy is not implemented on %s %s", runtime.GOOS, runtime.GOARCH)`
`18`	`18`
`19`	`19`	`type icmpProxy struct{}`
`20`	`20`