Reproducible Builds: trim embedded cgo paths

Signed-off-by: kpcyrd <git@rxv.cc>
This commit is contained in:
kpcyrd
2021-08-09 20:10:18 +02:00
parent 04ab2b1661
commit e7b7c90bae

View File

@ -90,8 +90,7 @@ else
ISODATE ?= $(shell date --iso-8601) ISODATE ?= $(shell date --iso-8601)
endif endif
LIBPOD := ${PROJECT}/v3/libpod LIBPOD := ${PROJECT}/v3/libpod
GCFLAGS ?= all=-trimpath=$(CURDIR) GOFLAGS ?= -trimpath
ASMFLAGS ?= all=-trimpath=$(CURDIR)
LDFLAGS_PODMAN ?= \ LDFLAGS_PODMAN ?= \
-X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \ -X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \
-X $(LIBPOD)/define.buildInfo=$(BUILD_INFO) \ -X $(LIBPOD)/define.buildInfo=$(BUILD_INFO) \
@ -295,8 +294,6 @@ endif
CGO_ENABLED=$(CGO_ENABLED) \ CGO_ENABLED=$(CGO_ENABLED) \
$(GO) build \ $(GO) build \
$(BUILDFLAGS) \ $(BUILDFLAGS) \
-gcflags '$(GCFLAGS)' \
-asmflags '$(ASMFLAGS)' \
-ldflags '$(LDFLAGS_PODMAN)' \ -ldflags '$(LDFLAGS_PODMAN)' \
-tags "$(BUILDTAGS)" \ -tags "$(BUILDTAGS)" \
-o $@ ./cmd/podman -o $@ ./cmd/podman
@ -310,8 +307,6 @@ $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum
GOOS=$(GOOS) \ GOOS=$(GOOS) \
$(GO) build \ $(GO) build \
$(BUILDFLAGS) \ $(BUILDFLAGS) \
-gcflags '$(GCFLAGS)' \
-asmflags '$(ASMFLAGS)' \
-ldflags '$(LDFLAGS_PODMAN)' \ -ldflags '$(LDFLAGS_PODMAN)' \
-tags "${REMOTETAGS}" \ -tags "${REMOTETAGS}" \
-o $@ ./cmd/podman -o $@ ./cmd/podman
@ -321,8 +316,6 @@ $(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.s
GOOS=$(GOOS) \ GOOS=$(GOOS) \
$(GO) build \ $(GO) build \
$(BUILDFLAGS) \ $(BUILDFLAGS) \
-gcflags '$(GCFLAGS)' \
-asmflags '$(ASMFLAGS)' \
-ldflags '$(LDFLAGS_PODMAN_STATIC)' \ -ldflags '$(LDFLAGS_PODMAN_STATIC)' \
-tags "${REMOTETAGS}" \ -tags "${REMOTETAGS}" \
-o $@ ./cmd/podman -o $@ ./cmd/podman
@ -376,8 +369,6 @@ bin/podman.cross.%: .gopathok
CGO_ENABLED=0 \ CGO_ENABLED=0 \
$(GO) build \ $(GO) build \
$(BUILDFLAGS) \ $(BUILDFLAGS) \
-gcflags '$(GCFLAGS)' \
-asmflags '$(ASMFLAGS)' \
-ldflags '$(LDFLAGS_PODMAN)' \ -ldflags '$(LDFLAGS_PODMAN)' \
-tags '$(BUILDTAGS_CROSS)' \ -tags '$(BUILDTAGS_CROSS)' \
-o "$@" ./cmd/podman -o "$@" ./cmd/podman