From 156dbcfa70a72594ce5df2b46a06c784771b672b Mon Sep 17 00:00:00 2001
From: sam-at-luther <sam.wood@luthersystems.com>
Date: Fri, 1 Dec 2023 12:11:29 -0800
Subject: [PATCH] Remove CGO

---
 images/build-go.mk        | 7 +++----
 images/build-godynamic.mk | 7 +++----
 images/build-goextra.mk   | 6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/images/build-go.mk b/images/build-go.mk
index 995b77c..ce930b8 100644
--- a/images/build-go.mk
+++ b/images/build-go.mk
@@ -1,5 +1,5 @@
 GO_TEST_FLAGS ?= -cover
-GO_BUILD_TAGS ?= netgo,cgo,timetzdata
+GO_BUILD_TAGS ?= netgo,timetzdata
 GO_BUILD_EXTRA_FLAGS ?= -a
 
 GO_BUILD_FLAGS=-installsuffix ${GO_BUILD_TAGS} -tags ${GO_BUILD_TAGS} -buildvcs=false
@@ -21,10 +21,9 @@ build:
 	@echo "Building BIN=\"${BIN}\" VERSION=\"${VERSION}\""
 	mkdir -p build/bin
 	go env
-	# build static binary with CGO extensions enabled and libtool
-	CGO_ENABLED=1 GOOS=linux go build ${GO_BUILD_EXTRA_FLAGS} ${GO_BUILD_FLAGS} -ldflags '${GO_LD_FLAGS}' -o ${BIN}
+	go build ${GO_BUILD_EXTRA_FLAGS} ${GO_BUILD_FLAGS} -ldflags '${GO_LD_FLAGS}' -o ${BIN}
 
 .PHONY: test
 test:
 	@echo "Test"
-	CGO_LDFLAGS_ALLOW=-I/usr/local/share/libtool go test ${GO_TEST_FLAGS} ${GO_BUILD_FLAGS} ./...
+	go test ${GO_TEST_FLAGS} ${GO_BUILD_FLAGS} ./...
diff --git a/images/build-godynamic.mk b/images/build-godynamic.mk
index f4bddf5..61d7d9c 100644
--- a/images/build-godynamic.mk
+++ b/images/build-godynamic.mk
@@ -1,5 +1,5 @@
 GO_TEST_FLAGS ?= -cover
-GO_BUILD_TAGS ?= netgo,cgo,timetzdata
+GO_BUILD_TAGS ?= netgo,timetzdata
 GO_BUILD_EXTRA_FLAGS ?= -a
 
 GO_BUILD_FLAGS=-installsuffix ${GO_BUILD_TAGS} -tags ${GO_BUILD_TAGS} -buildvcs=false
@@ -21,10 +21,9 @@ build:
 	@echo "Building BIN=\"${BIN}\" VERSION=\"${VERSION}\""
 	mkdir -p build/bin
 	go env
-	# build dynamic binary with CGO extensions enabled and libtool
-	CGO_ENABLED=1 GOOS=linux go build ${GO_BUILD_EXTRA_FLAGS} ${GO_BUILD_FLAGS} -ldflags '${GO_LD_FLAGS}' -o ${BIN}
+	go build ${GO_BUILD_EXTRA_FLAGS} ${GO_BUILD_FLAGS} -ldflags '${GO_LD_FLAGS}' -o ${BIN}
 
 .PHONY: test
 test:
 	@echo "Test"
-	CGO_LDFLAGS_ALLOW=-I/usr/local/share/libtool go test ${GO_TEST_FLAGS} ${GO_BUILD_FLAGS} ./...
+	go test ${GO_TEST_FLAGS} ${GO_BUILD_FLAGS} ./...
diff --git a/images/build-goextra.mk b/images/build-goextra.mk
index 8e6e994..b14e78a 100644
--- a/images/build-goextra.mk
+++ b/images/build-goextra.mk
@@ -1,5 +1,5 @@
 GO_TEST_FLAGS ?= -cover
-GO_BUILD_TAGS ?= netgo,cgo,timetzdata
+GO_BUILD_TAGS ?= netgo,timetzdata
 GO_BUILD_EXTRA_FLAGS ?= -a
 
 GO_BUILD_FLAGS=-installsuffix ${GO_BUILD_TAGS} -tags ${GO_BUILD_TAGS} -buildvcs=false
@@ -24,9 +24,9 @@ build:
 	mkdir -p build/bin
 	go env
 	# build static binary with CGO extensions enabled and libtool
-	CGO_ENABLED=1 GOOS=linux go build ${GO_BUILD_EXTRA_FLAGS}  ${GO_BUILD_FLAGS} -ldflags '${GO_LD_FLAGS}' -o ${BIN}
+	go build ${GO_BUILD_EXTRA_FLAGS}  ${GO_BUILD_FLAGS} -ldflags '${GO_LD_FLAGS}' -o ${BIN}
 
 .PHONY: test
 test:
 	@echo "Test"
-	CGO_LDFLAGS_ALLOW=-I/usr/local/share/libtool GOCACHE=off go test ${GO_TEST_FLAGS} ${GO_BUILD_FLAGS} ./...
+	go test ${GO_TEST_FLAGS} ${GO_BUILD_FLAGS} ./...