From 7037cb27718fe23541885684fdacec9c52ee0e30 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 13 Sep 2022 11:55:45 -0400 Subject: [PATCH] makefile: add GOBUILDFLAGS to go build call We may need to specify things like -trimpath, so add $(GOBUILDFLAGS) to allow them to be passed from the recipe to the Makefile. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Bruce Ashfield --- src/import/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: git/src/import/Makefile =================================================================== --- git.orig/Makefile +++ git/Makefile @@ -126,7 +126,7 @@ # Build w/o using containers .PHONY: bin/skopeo bin/skopeo: - $(GO) build ${GO_DYN_FLAGS} ${SKOPEO_LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo + $(GO) build $(GOBUILDFLAGS) ${GO_DYN_FLAGS} ${SKOPEO_LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo bin/skopeo.%: GOOS=$(word 2,$(subst ., ,$@)) GOARCH=$(word 3,$(subst ., ,$@)) $(GO) build ${SKOPEO_LDFLAGS} -tags "containers_image_openpgp $(BUILDTAGS)" -o $@ ./cmd/skopeo local-cross: bin/skopeo.darwin.amd64 bin/skopeo.linux.arm bin/skopeo.linux.arm64 bin/skopeo.windows.386.exe bin/skopeo.windows.amd64.exe