diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-08-10 14:47:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-10 14:47:50 -0400 |
| commit | 8b14cd84ced46263f378c6090ccb61616810eb9e (patch) | |
| tree | bebd090042f26d4071bb935a79363641b36c4ca0 | |
| parent | 9e9174ebc51ee60678250a74c75de6e18e177414 (diff) | |
| parent | e7b7c90bae1c65f61f524498e0ff152639f1ce04 (diff) | |
| download | podman-8b14cd84ced46263f378c6090ccb61616810eb9e.tar.gz podman-8b14cd84ced46263f378c6090ccb61616810eb9e.tar.bz2 podman-8b14cd84ced46263f378c6090ccb61616810eb9e.zip | |
Merge pull request #11160 from kpcyrd/repro-builds
Reproducible Builds: trim embedded cgo paths
| -rw-r--r-- | Makefile | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -90,8 +90,7 @@ else ISODATE ?= $(shell date --iso-8601) endif LIBPOD := ${PROJECT}/v3/libpod -GCFLAGS ?= all=-trimpath=$(CURDIR) -ASMFLAGS ?= all=-trimpath=$(CURDIR) +GOFLAGS ?= -trimpath LDFLAGS_PODMAN ?= \ -X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \ -X $(LIBPOD)/define.buildInfo=$(BUILD_INFO) \ @@ -295,8 +294,6 @@ endif CGO_ENABLED=$(CGO_ENABLED) \ $(GO) build \ $(BUILDFLAGS) \ - -gcflags '$(GCFLAGS)' \ - -asmflags '$(ASMFLAGS)' \ -ldflags '$(LDFLAGS_PODMAN)' \ -tags "$(BUILDTAGS)" \ -o $@ ./cmd/podman @@ -310,8 +307,6 @@ $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum GOOS=$(GOOS) \ $(GO) build \ $(BUILDFLAGS) \ - -gcflags '$(GCFLAGS)' \ - -asmflags '$(ASMFLAGS)' \ -ldflags '$(LDFLAGS_PODMAN)' \ -tags "${REMOTETAGS}" \ -o $@ ./cmd/podman @@ -321,8 +316,6 @@ $(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.s GOOS=$(GOOS) \ $(GO) build \ $(BUILDFLAGS) \ - -gcflags '$(GCFLAGS)' \ - -asmflags '$(ASMFLAGS)' \ -ldflags '$(LDFLAGS_PODMAN_STATIC)' \ -tags "${REMOTETAGS}" \ -o $@ ./cmd/podman @@ -376,8 +369,6 @@ bin/podman.cross.%: .gopathok CGO_ENABLED=0 \ $(GO) build \ $(BUILDFLAGS) \ - -gcflags '$(GCFLAGS)' \ - -asmflags '$(ASMFLAGS)' \ -ldflags '$(LDFLAGS_PODMAN)' \ -tags '$(BUILDTAGS_CROSS)' \ -o "$@" ./cmd/podman |