@@ -13,7 +13,6 @@ import (

 	"time"

 	"github.com/docker/libcontainer/label"

-	"github.com/docker/libcontainer/selinux"

 	"github.com/dotcloud/docker/archive"

 	"github.com/dotcloud/docker/daemon/execdriver"

 	"github.com/dotcloud/docker/daemon/execdriver/execdrivers"

@@ -300,7 +299,8 @@ func (daemon *Daemon) Destroy(container *Container) error {

 	if err := os.RemoveAll(container.root); err != nil {

 		return fmt.Errorf("Unable to remove filesystem for %v: %v", container.ID, err)

 	}

-	selinux.FreeLxcContexts(container.ProcessLabel)

+

+	selinuxFreeLxcContexts(container.ProcessLabel)

 	return nil

 }

@@ -761,7 +761,7 @@ func NewDaemon(config *daemonconfig.Config, eng *engine.Engine) (*Daemon, error)

 func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*Daemon, error) {

 	if !config.EnableSelinuxSupport {

-		selinux.SetDisabled()

+		selinuxSetDisabled()

 	}

 	// Create the root directory if it doesn't exists

@@ -1,4 +1,4 @@

-// +build linux

+// +build linux,cgo

 package native

@@ -1,4 +1,4 @@

-// +build linux

+// +build linux,cgo

 package native

new file mode 100644

@@ -0,0 +1,13 @@

+// +build linux,!cgo

+

+package native

+

+import (

+	"fmt"

+

+	"github.com/dotcloud/docker/daemon/execdriver"

+)

+

+func NewDriver(root, initPath string) (execdriver.Driver, error) {

+	return nil, fmt.Errorf("native driver not supported on non-linux")

+}

@@ -1,4 +1,4 @@

-// +build linux

+// +build linux,cgo

 package native

new file mode 100644

@@ -0,0 +1,13 @@

+// +build linux

+

+package daemon

+

+import "github.com/docker/libcontainer/selinux"

+

+func selinuxSetDisabled() {

+	selinux.SetDisabled()

+}

+

+func selinuxFreeLxcContexts(label string) {

+	selinux.FreeLxcContexts(label)

+}

new file mode 100644

@@ -0,0 +1,9 @@

+// +build !linux

+

+package daemon

+

+func selinuxSetDisabled() {

+}

+

+func selinuxFreeLxcContexts(label string) {

+}