github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2025-03-30 15:56:10 +02:00
Code Releases Activity

cmount: remove cgo from windows build requirements since it builds without

Browse Source
This commit is contained in:
Nick Craig-Wood 2022-04-24 10:27:28 +01:00
parent 1b0128ecb2
commit a947f298e6
5 changed files with 15 additions and 15 deletions

7
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 cmount
// +build cgo // +build linux,cgo darwin,cgo freebsd,cgo windows
// +build linux darwin freebsd windows
package cmount package cmount
@ -13,12 +12,12 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/winfsp/cgofuse/fuse"
"github.com/rclone/rclone/cmd/mountlib" "github.com/rclone/rclone/cmd/mountlib"
"github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/fserrors" "github.com/rclone/rclone/fs/fserrors"
"github.com/rclone/rclone/fs/log" "github.com/rclone/rclone/fs/log"
"github.com/rclone/rclone/vfs" "github.com/rclone/rclone/vfs"
"github.com/winfsp/cgofuse/fuse"
) )
const fhUnset = ^uint64(0) const fhUnset = ^uint64(0)

7
cmd/cmount/mount.go

@ -2,10 +2,9 @@
// //
// This uses the cgo based cgofuse library // 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 cmount
// +build cgo // +build linux,cgo darwin,cgo freebsd,cgo windows
// +build linux darwin freebsd windows
package cmount package cmount
@ -18,12 +17,12 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/winfsp/cgofuse/fuse"
"github.com/rclone/rclone/cmd/mountlib" "github.com/rclone/rclone/cmd/mountlib"
"github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs"
"github.com/rclone/rclone/lib/atexit" "github.com/rclone/rclone/lib/atexit"
"github.com/rclone/rclone/lib/buildinfo" "github.com/rclone/rclone/lib/buildinfo"
"github.com/rclone/rclone/vfs" "github.com/rclone/rclone/vfs"
"github.com/winfsp/cgofuse/fuse"
) )
func init() { func init() {

5
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 cmount
// +build cgo // +build linux,cgo darwin,cgo freebsd,cgo windows
// +build linux darwin freebsd windows
// +build !race !windows // +build !race !windows
// FIXME this doesn't work with the race detector under Windows either // FIXME this doesn't work with the race detector under Windows either

7
cmd/cmount/mount_unsupported.go

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

4
cmd/cmount/mountpoint_windows.go

@ -1,5 +1,5 @@
//go:build cmount && cgo && windows //go:build cmount && windows
// +build cmount,cgo,windows // +build cmount,windows
package cmount package cmount