cmount: remove cgo from windows build requirements since it builds wi…

…thout
rclone · Apr 29, 2022 · a947f29 · a947f29
1 parent 1b0128e
commit a947f29
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/cmd/cmount/fs.go b/cmd/cmount/fs.go
@@ -1,7 +1,6 @@
-//go:build cmount && cgo && (linux || darwin || freebsd || windows)
+//go:build cmount && ((linux && cgo) || (darwin && cgo) || (freebsd && cgo) || windows)
 // +build cmount
-// +build cgo
-// +build linux darwin freebsd windows
+// +build linux,cgo darwin,cgo freebsd,cgo windows
 
 package cmount
 
@@ -13,12 +12,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/winfsp/cgofuse/fuse"
 	"github.com/rclone/rclone/cmd/mountlib"
 	"github.com/rclone/rclone/fs"
 	"github.com/rclone/rclone/fs/fserrors"
 	"github.com/rclone/rclone/fs/log"
 	"github.com/rclone/rclone/vfs"
+	"github.com/winfsp/cgofuse/fuse"
 )
 
 const fhUnset = ^uint64(0)

diff --git a/cmd/cmount/mount.go b/cmd/cmount/mount.go
@@ -2,10 +2,9 @@
 //
 // This uses the cgo based cgofuse library
 
-//go:build cmount && cgo && (linux || darwin || freebsd || windows)
+//go:build cmount && ((linux && cgo) || (darwin && cgo) || (freebsd && cgo) || windows)
 // +build cmount
-// +build cgo
-// +build linux darwin freebsd windows
+// +build linux,cgo darwin,cgo freebsd,cgo windows
 
 package cmount
 
@@ -18,12 +17,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/winfsp/cgofuse/fuse"
 	"github.com/rclone/rclone/cmd/mountlib"
 	"github.com/rclone/rclone/fs"
 	"github.com/rclone/rclone/lib/atexit"
 	"github.com/rclone/rclone/lib/buildinfo"
 	"github.com/rclone/rclone/vfs"
+	"github.com/winfsp/cgofuse/fuse"
 )
 
 func init() {

diff --git a/cmd/cmount/mount_test.go b/cmd/cmount/mount_test.go
@@ -1,7 +1,6 @@
-//go:build cmount && cgo && (linux || darwin || freebsd || windows) && (!race || !windows)
+//go:build cmount && ((linux && cgo) || (darwin && cgo) || (freebsd && cgo) || windows) && (!race || !windows)
 // +build cmount
-// +build cgo
-// +build linux darwin freebsd windows
+// +build linux,cgo darwin,cgo freebsd,cgo windows
 // +build !race !windows
 
 // FIXME this doesn't work with the race detector under Windows either

diff --git a/cmd/cmount/mount_unsupported.go b/cmd/cmount/mount_unsupported.go
@@ -1,7 +1,10 @@
 // Build for cmount for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
-//go:build (!linux && !darwin && !freebsd && !windows) || !brew || !cgo || !cmount
-// +build !linux,!darwin,!freebsd,!windows !brew !cgo !cmount
+//go:build !((linux && cgo && cmount) || (darwin && cgo && cmount) || (freebsd && cgo && cmount) || (windows && cmount))
+// +build !linux !cgo !cmount
+// +build !darwin !cgo !cmount
+// +build !freebsd !cgo !cmount
+// +build !windows !cmount
 
 package cmount
diff --git a/cmd/cmount/mountpoint_windows.go b/cmd/cmount/mountpoint_windows.go
@@ -1,5 +1,5 @@
-//go:build cmount && cgo && windows
-// +build cmount,cgo,windows
+//go:build cmount && windows
+// +build cmount,windows
 
 package cmount