Fix static builds in go1.4

golang/go#9344
duda · Jan 21, 2015 · 0a53813 · 0a53813
1 parent f90ad57
commit 0a53813
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/build/hello-kubernetes/prepare.sh b/build/hello-kubernetes/prepare.sh
@@ -17,4 +17,4 @@
 set -e
 set -x
 
-CGO_ENABLED=0 go build  -a -ldflags '-extldflags "-static" -s' hello.go
+CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags '-extldflags "-static" -s' hello.go
diff --git a/cluster/addons/dns/kube2sky/Makefile b/cluster/addons/dns/kube2sky/Makefile
@@ -1,7 +1,7 @@
 all: kube2sky
 
 kube2sky: kube2sky.go
-	CGO_ENABLED=0 go build -a --ldflags '-w' ./kube2sky.go
+	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./kube2sky.go
 
 container: kube2sky
 	sudo docker build -t kubernetes/kube2sky .

diff --git a/cluster/addons/dns/skydns/Makefile b/cluster/addons/dns/skydns/Makefile
@@ -1,7 +1,7 @@
 all: skydns
 
 skydns:
-	CGO_ENABLED=0 go build -a --ldflags '-w' github.com/skynetservices/skydns
+	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' github.com/skynetservices/skydns
 
 container: skydns
 	sudo docker build -t kubernetes/skydns .

diff --git a/contrib/for-demos/serve_hostname/Makefile b/contrib/for-demos/serve_hostname/Makefile
@@ -1,7 +1,7 @@
 all: serve_hostname
 
 serve_hostname: serve_hostname.go
-	CGO_ENABLED=0 go build -a --ldflags '-w' ./serve_hostname.go
+	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./serve_hostname.go
 
 container: serve_hostname
 	sudo docker build -t kubernetes/serve_hostname .

diff --git a/contrib/for-demos/test-webserver/Makefile b/contrib/for-demos/test-webserver/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 test-webserver: test-webserver.go
-	CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w' ./test-webserver.go
+	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./test-webserver.go
 
 container: test-webserver
 	sudo docker build -t kubernetes/test-webserver .

diff --git a/contrib/for-tests/network-tester/Makefile b/contrib/for-tests/network-tester/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 webserver: webserver.go
-	CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w' ./webserver.go
+	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go
 
 container: webserver
 	sudo docker build -t kubernetes/nettest .

diff --git a/examples/liveness/image/Makefile b/examples/liveness/image/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 server: server.go
-	CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w' ./server.go
+	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./server.go
 
 container: server
 	docker build -t kubernetes/liveness .
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ @@
     set -e
     set -x
-    CGO_ENABLED=0 go build  -a -ldflags '-extldflags "-static" -s' hello.go
+    CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags '-extldflags "-static" -s' hello.go