From aef2057e5aff7e42ea6e43933d20ec8bbc482ab9 Mon Sep 17 00:00:00 2001
From: Joe Lanford <joe.lanford@gmail.com>
Date: Wed, 7 Jun 2023 09:21:00 -0400
Subject: [PATCH] Makefile: build targets use go build directly

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
---
 .goreleaser.yml | 23 ++++++---------------
 Makefile        | 54 ++++++++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 0919e7c6..d007b81c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,8 +1,3 @@
-
-env:
-- GOPROXY=https://proxy.golang.org|direct
-- GO111MODULE=on
-- CGO_ENABLED=0
 before:
   hooks:
     - go mod tidy
@@ -11,6 +6,12 @@ builds:
   - id: manager
     main: ./cmd/manager/
     binary: manager
+    asmflags: "{{ .Env.GO_BUILD_ASMFLAGS }}"
+    gcflags: "{{ .Env.GO_BUILD_GCFLAGS }}"
+    ldflags: "{{ .Env.GO_BUILD_LDFLAGS }}"
+    tags:
+    - "{{ .Env.GO_BUILD_TAGS }}"
+    mod_timestamp: "{{ .CommitTimestamp }}"
     goos:
     - linux
     goarch:
@@ -18,18 +19,6 @@ builds:
     - arm64
     - ppc64le
     - s390x
-    tags:
-    - "{{ .Env.GO_BUILD_TAGS }}"
-    mod_timestamp: "{{ .CommitTimestamp }}"
-    asmflags:
-      - all=-trimpath={{ dir .Env.PWD }}
-    gcflags:
-      - all=-trimpath={{ dir .Env.PWD }}
-    ldflags:
-    - -X {{ .Env.VERSION_PKG }}.gitVersion={{ .Env.GIT_VERSION }}
-    - -X {{ .Env.VERSION_PKG }}.gitCommit={{ .Env.GIT_COMMIT }}
-    - -X {{ .Env.VERSION_PKG }}.gitTreeState={{ .Env.GIT_TREE_STATE }}
-    - -X {{ .Env.VERSION_PKG }}.commitDate={{ .CommitTimestamp }}
 dockers:
 - image_templates:
   - "{{ .Env.IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
diff --git a/Makefile b/Makefile
index 822de9fe..5a0d6a58 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,3 @@
-# Build info
-export GO_BUILD_TAGS  ?= ''
-export GIT_COMMIT     ?= $(shell git rev-parse HEAD)
-export GIT_VERSION    ?= $(shell git describe --tags --always --dirty)
-export GIT_TREE_STATE ?= $(shell [ -z "$(shell git status --porcelain)" ] && echo "clean" || echo "dirty")
-export VERSION_PKG    ?= $(shell go list -m)/internal/version
-
 export IMAGE_REPO                ?= quay.io/operator-framework/catalogd
 export IMAGE_TAG                 ?= devel
 IMAGE=$(IMAGE_REPO):$(IMAGE_TAG)
@@ -58,7 +51,7 @@ fmt: ## Run go fmt against code.
 
 .PHONY: vet
 vet: ## Run go vet against code.
-	go vet -tags $(GO_BUILD_TAGS) ./...
+	go vet -tags '$(GO_BUILD_TAGS)' ./...
 
 .PHONY: test
 test-unit: generate fmt vet $(SETUP_ENVTEST) ## Run tests.
@@ -77,25 +70,44 @@ verify: tidy fmt vet generate ## Verify the current code generation and lint
 BINARIES=manager
 LINUX_BINARIES=$(join $(addprefix linux/,$(BINARIES)), )
 
-BUILDCMD = sh -c 'mkdir -p $(BUILDBIN) && $(GORELEASER) build $(GORELEASER_ARGS) --id $(notdir $@) --single-target -o $(BUILDBIN)/$(notdir $@)'
-BUILDDEPS = $(GORELEASER)
-
-.PHONY: build
-build: $(BINARIES)  ## Build all project binaries for the local OS and architecture.
-
-.PHONY: build-linux
-build-linux: $(LINUX_BINARIES) ## Build all project binaries for GOOS=linux and the local architecture.
-
-.PHONY: $(BINARIES)
+# Build info
+export VERSION_PKG     ?= $(shell go list -m)/internal/version
+
+export GIT_COMMIT      ?= $(shell git rev-parse HEAD)
+export GIT_VERSION     ?= $(shell git describe --tags --always --dirty)
+export GIT_TREE_STATE  ?= $(shell [ -z "$(shell git status --porcelain)" ] && echo "clean" || echo "dirty")
+export GIT_COMMIT_DATE ?= $(shell TZ=UTC0 git show --quiet --date=format:'%Y-%m-%dT%H:%M:%SZ' --format="%cd")
+
+export CGO_ENABLED       ?= 0
+export GO_BUILD_ASMFLAGS ?= all=-trimpath=${PWD}
+export GO_BUILD_LDFLAGS  ?= -s -w \
+    -X "$(VERSION_PKG).gitVersion=$(GIT_VERSION)" \
+    -X "$(VERSION_PKG).gitCommit=$(GIT_COMMIT)" \
+    -X "$(VERSION_PKG).gitTreeState=$(GIT_TREE_STATE)" \
+    -X "$(VERSION_PKG).commitDate=$(GIT_COMMIT_DATE)"
+export GO_BUILD_GCFLAGS  ?= all=-trimpath=${PWD}
+export GO_BUILD_TAGS     ?=
+
+BUILDCMD = go build -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$(notdir $@) ./cmd/$(notdir $@)
+
+.PHONY: build-deps
+build-deps: generate fmt vet
+
+.PHONY: build go-build-local $(BINARIES)
+build: build-deps go-build-local ## Build binaries for current GOOS and GOARCH.
+go-build-local: $(BINARIES)
 $(BINARIES): BUILDBIN = bin
-$(BINARIES): $(BUILDDEPS)
+$(BINARIES):
 	$(BUILDCMD)
 
-.PHONY: $(LINUX_BINARIES)
+.PHONY: build-linux go-build-linux $(LINUX_BINARIES)
+build-linux: build-deps go-build-linux ## Build binaries for GOOS=linux and local GOARCH.
+go-build-linux: $(LINUX_BINARIES)
 $(LINUX_BINARIES): BUILDBIN = bin/linux
-$(LINUX_BINARIES): $(BUILDDEPS)
+$(LINUX_BINARIES):
 	GOOS=linux $(BUILDCMD)
 
+
 .PHONY: run
 run: generate kind-cluster install ## Create a kind cluster and install a local build of catalogd