Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate

Replace amd64 build tags with cgo as appropriate
2014-08-07 16:24:19 -04:00 · 2014-08-07 16:24:19 -04:00 · ab3e34e187
--- a/daemon/execdriver/lxc/lxc_init_linux.go
+++ b/daemon/execdriver/lxc/lxc_init_linux.go
@ -1,5 +1,3 @@
-// +build amd64
-
 package lxc

 import (
--- a/daemon/execdriver/lxc/lxc_init_unsupported.go
+++ b/daemon/execdriver/lxc/lxc_init_unsupported.go
@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux

 package lxc

--- a/daemon/graphdriver/aufs/mount_linux.go
+++ b/daemon/graphdriver/aufs/mount_linux.go
@ -1,5 +1,3 @@
-// +build amd64
-
 package aufs

 import "syscall"
--- a/daemon/graphdriver/aufs/mount_unsupported.go
+++ b/daemon/graphdriver/aufs/mount_unsupported.go
@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux

 package aufs

--- a/daemon/graphdriver/btrfs/btrfs.go
+++ b/daemon/graphdriver/btrfs/btrfs.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package btrfs

--- a/daemon/graphdriver/btrfs/dummy_unsupported.go
+++ b/daemon/graphdriver/btrfs/dummy_unsupported.go
@ -1,3 +1,3 @@
-// +build !linux !amd64
+// +build !linux !cgo

 package btrfs
--- a/daemon/graphdriver/devmapper/attach_loopback.go
+++ b/daemon/graphdriver/devmapper/attach_loopback.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/daemon/graphdriver/devmapper/deviceset.go
+++ b/daemon/graphdriver/devmapper/deviceset.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/daemon/graphdriver/devmapper/devmapper.go
+++ b/daemon/graphdriver/devmapper/devmapper.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/daemon/graphdriver/devmapper/devmapper_log.go
+++ b/daemon/graphdriver/devmapper/devmapper_log.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/daemon/graphdriver/devmapper/devmapper_test.go
+++ b/daemon/graphdriver/devmapper/devmapper_test.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/daemon/graphdriver/devmapper/devmapper_wrapper.go
+++ b/daemon/graphdriver/devmapper/devmapper_wrapper.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/daemon/graphdriver/devmapper/driver.go
+++ b/daemon/graphdriver/devmapper/driver.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/daemon/graphdriver/devmapper/ioctl.go
+++ b/daemon/graphdriver/devmapper/ioctl.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/daemon/graphdriver/devmapper/mount.go
+++ b/daemon/graphdriver/devmapper/mount.go
@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux

 package devmapper

--- a/pkg/mount/flags_linux.go
+++ b/pkg/mount/flags_linux.go
@ -1,5 +1,3 @@
-// +build amd64
-
 package mount

 import (
--- a/pkg/mount/flags_unsupported.go
+++ b/pkg/mount/flags_unsupported.go
@ -1,4 +1,4 @@
-// +build !linux,!freebsd linux,!amd64 freebsd,!cgo
+// +build !linux,!freebsd freebsd,!cgo

 package mount

--- a/pkg/mount/mounter_linux.go
+++ b/pkg/mount/mounter_linux.go
@ -1,5 +1,3 @@
-// +build amd64
-
 package mount

 import (
--- a/pkg/mount/mounter_unsupported.go
+++ b/pkg/mount/mounter_unsupported.go
@ -1,4 +1,4 @@
-// +build !linux,!freebsd linux,!amd64 freebsd,!cgo
+// +build !linux,!freebsd freebsd,!cgo

 package mount

--- a/pkg/parsers/kernel/uname_linux.go
+++ b/pkg/parsers/kernel/uname_linux.go
@ -1,5 +1,3 @@
-// +build amd64
-
 package kernel

 import (
--- a/pkg/parsers/kernel/uname_unsupported.go
+++ b/pkg/parsers/kernel/uname_unsupported.go
@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux

 package kernel