new file mode 100644

@@ -0,0 +1,16 @@

+// +build !daemon

+

+package main

+

+import (

+	"fmt"

+	"runtime"

+	"strings"

+)

+

+// CmdDaemon reports on an error on windows, because there is no exec

+func (p DaemonProxy) CmdDaemon(args ...string) error {

+	return fmt.Errorf(

+		"`docker daemon` is not supported on %s. Please run `dockerd` directly",

+		strings.Title(runtime.GOOS))

+}

new file mode 100644

@@ -0,0 +1,20 @@

+// +build !daemon

+

+package main

+

+import (

+	"strings"

+	"testing"

+)

+

+func TestCmdDaemon(t *testing.T) {

+	proxy := NewDaemonProxy()

+	err := proxy.CmdDaemon("--help")

+	if err == nil {

+		t.Fatal("Expected CmdDaemon to fail on Windows.")

+	}

+

+	if !strings.Contains(err.Error(), "Please run `dockerd`") {

+		t.Fatalf("Expected an error about running dockerd, got %s", err)

+	}

+}

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

-// +build !windows

+// +build daemon

 package main

deleted file mode 100644

@@ -1,11 +0,0 @@

-package main

-

-import (

-	"fmt"

-)

-

-// CmdDaemon reports on an error on windows, because there is no exec

-func (p DaemonProxy) CmdDaemon(args ...string) error {

-	return fmt.Errorf(

-		"`docker daemon` does not exist on windows. Please run `dockerd` directly")

-}

deleted file mode 100644

@@ -1,18 +0,0 @@

-package main

-

-import (

-	"strings"

-	"testing"

-)

-

-func TestCmdDaemon(t *testing.T) {

-	proxy := NewDaemonProxy()

-	err := proxy.CmdDaemon("--help")

-	if err == nil {

-		t.Fatal("Expected CmdDaemon to fail in Windows.")

-	}

-

-	if !strings.Contains(err.Error(), "Please run `dockerd`") {

-		t.Fatalf("Expected an error about running dockerd, got %s", err)

-	}

-}

@@ -127,6 +127,7 @@ if [ "$DOCKER_EXPERIMENTAL" ]; then

 	DOCKER_BUILDTAGS+=" experimental"

 fi

+DOCKER_BUILDTAGS+=" daemon"

 if pkg-config 'libsystemd >= 209' 2> /dev/null ; then

 	DOCKER_BUILDTAGS+=" journald"

 elif pkg-config 'libsystemd-journal' 2> /dev/null ; then

@@ -35,7 +35,10 @@ for platform in $DOCKER_CROSSPLATFORMS; do

 		fi

 		if [ -z "${daemonSupporting[$platform]}" ]; then

-			export LDFLAGS_STATIC_DOCKER="" # we just need a simple client for these platforms

+            # we just need a simple client for these platforms

+			export LDFLAGS_STATIC_DOCKER=""

+            # remove the "daemon" build tag from platforms that aren't supported

+            export BUILDFLAGS=( "${ORIG_BUILDFLAGS[@]/ daemon/}" )

 		    source "${MAKEDIR}/binary-client"

         else

 		    source "${MAKEDIR}/binary-client"