From 5d5ede2b85bcc26786c2c230f6bc2a564aff24b9 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 12 Dec 2017 00:09:36 -0500
Subject: [PATCH] revert: drop reference to CGO_ENABLED completely

---
 plugins/config/Makefile  | 6 +++---
 plugins/network/Makefile | 8 ++++----
 plugins/repo/Makefile    | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/config/Makefile b/plugins/config/Makefile
index d975333ba..74d8ef36e 100644
--- a/plugins/config/Makefile
+++ b/plugins/config/Makefile
@@ -1,7 +1,7 @@
 include ../../common.mk
 
 GO_ARGS ?= -a
-CGO_ENABLED ?= 1
+
 SUBCOMMANDS = subcommands/export subcommands/get subcommands/set subcommands/unset subcommands/keys subcommands/bundle
 
 build-in-docker: clean
@@ -14,12 +14,12 @@ build-in-docker: clean
 build: commands subcommands
 
 commands: **/**/commands.go
-	CGO_ENABLED=$(CGO_ENABLED) go build $(GO_ARGS) -o commands src/commands/commands.go
+	go build $(GO_ARGS) -o commands src/commands/commands.go
 
 subcommands: $(SUBCOMMANDS)
 
 subcommands/%: src/subcommands/*/%.go
-	CGO_ENABLED=$(CGO_ENABLED) go build $(GO_ARGS) -o $@ $<
+	go build $(GO_ARGS) -o $@ $<
 
 clean:
 	rm -rf commands subcommands
diff --git a/plugins/network/Makefile b/plugins/network/Makefile
index f9d7641a9..74084bae6 100644
--- a/plugins/network/Makefile
+++ b/plugins/network/Makefile
@@ -1,7 +1,7 @@
 include ../../common.mk
 
 GO_ARGS ?= -a
-CGO_ENABLED ?= 1
+
 SUBCOMMANDS = subcommands/rebuild subcommands/rebuildall subcommands/report subcommands/set
 TRIGGERS = triggers/install triggers/network-build-config triggers/network-compute-ports triggers/network-config-exists triggers/network-get-ipaddr triggers/network-get-listeners triggers/network-get-port triggers/network-get-property triggers/network-write-ipaddr triggers/network-write-port triggers/post-create triggers/post-delete
 build-in-docker: clean
@@ -14,12 +14,12 @@ build-in-docker: clean
 build: commands subcommands triggers
 
 commands: **/**/commands.go
-	CGO_ENABLED=$(CGO_ENABLED) go build $(GO_ARGS) -o commands src/commands/commands.go
+	go build $(GO_ARGS) -o commands src/commands/commands.go
 
 subcommands: $(SUBCOMMANDS)
 
 subcommands/%: src/subcommands/*/%.go
-	CGO_ENABLED=$(CGO_ENABLED) go build $(GO_ARGS) -o $@ $<
+	go build $(GO_ARGS) -o $@ $<
 
 clean:
 	rm -rf commands subcommands network-* install post-create post-delete
@@ -30,4 +30,4 @@ src-clean:
 triggers: $(TRIGGERS)
 
 triggers/%: src/triggers/*/%.go
-	CGO_ENABLED=$(CGO_ENABLED) go build $(GO_ARGS) -o $@ $<
+	go build $(GO_ARGS) -o $@ $<
diff --git a/plugins/repo/Makefile b/plugins/repo/Makefile
index f62dc7d8b..3940279d1 100644
--- a/plugins/repo/Makefile
+++ b/plugins/repo/Makefile
@@ -1,7 +1,7 @@
 include ../../common.mk
 
 GO_ARGS ?= -a
-CGO_ENABLED ?= 1
+
 SUBCOMMANDS = subcommands/gc subcommands/purge-cache
 
 build-in-docker: clean
@@ -14,12 +14,12 @@ build-in-docker: clean
 build: commands subcommands
 
 commands: **/**/commands.go
-	CGO_ENABLED=$(CGO_ENABLED) go build $(GO_ARGS) -o commands src/commands/commands.go
+	go build $(GO_ARGS) -o commands src/commands/commands.go
 
 subcommands: $(SUBCOMMANDS)
 
 subcommands/%: src/subcommands/*/%.go
-	CGO_ENABLED=$(CGO_ENABLED) go build $(GO_ARGS) -o $@ $<
+	go build $(GO_ARGS) -o $@ $<
 
 clean:
 	rm -rf commands subcommands