From c46febd7df21c5003a9992c1add06a2132b7c5cb Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 16 Dec 2015 11:45:10 +0000 Subject: [PATCH] Fix Makefile so weavewait* are statically linked - the `-tags netgo` was being ignored by an interaction with the newer tags --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b0dc5aca..48b2da7f 100644 --- a/Makefile +++ b/Makefile @@ -92,11 +92,11 @@ $(SIGPROXY_EXE) $(DOCKERTLSARGS_EXE) $(DOCKERPLUGIN_EXE) $(TEST_TLS_EXE): $(WEAVEWAIT_EXE): prog/weavewait/*.go net/*.go go get -tags netgo ./$(@D) - go build $(BUILD_FLAGS) -tags "iface mcast" -o $@ ./$(@D) + go build $(BUILD_FLAGS) -tags "netgo iface mcast" -o $@ ./$(@D) $(WEAVEWAIT_NOMCAST_EXE): prog/weavewait/*.go net/*.go go get -tags netgo ./$(@D) - go build $(BUILD_FLAGS) -tags iface -o $@ ./$(@D) + go build $(BUILD_FLAGS) -tags "netgo iface" -o $@ ./$(@D) $(WEAVEWAIT_NOOP_EXE): prog/weavewait/*.go go get -tags netgo ./$(@D)