From eee0b19dbfd46b00bc222ba19e2788a06af17b15 Mon Sep 17 00:00:00 2001 From: Angel Montero Date: Sun, 12 Jan 2025 00:42:46 +0000 Subject: [PATCH] remove -arch flags from Makefile --- Makefile | 4 ++-- vendor/github.com/buildpacks/pack/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 52ed47c2c28..fbd547c175f 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ endif # when build for local development (`LOCAL=true make install` can skip license check) $(BUILD_DIR)/$(PROJECT): $(EMBEDDED_FILES_CHECK) $(GO_FILES) $(BUILD_DIR) - $(eval ldflags = $(GO_LDFLAGS) $(patsubst %,-extldflags \"%\",$(LDFLAGS_$(os)))) + $(eval ldflags = $(GO_LDFLAGS) $(patsubst %,-extldflags \"%\",$(LDFLAGS_$(GOOS)))) $(eval tags = $(GO_BUILD_TAGS) $(GO_BUILD_TAGS_$(GOOS)) $(GO_BUILD_TAGS_$(GOOS)_$(GOARCH))) GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=1 \ go build -mod="vendor" -gcflags="all=-N -l" -tags "$(tags)" -ldflags "$(ldflags)" -o $@ $(BUILD_PACKAGE) @@ -98,7 +98,7 @@ $(BUILD_DIR)/$(PROJECT)-%: $(EMBEDDED_FILES_CHECK) $(GO_FILES) $(BUILD_DIR) $(eval arch = $(lastword $(subst -, ,$(subst .exe,,$*)))) $(eval ldflags = $(GO_LDFLAGS) $(patsubst %,-extldflags \"%\",$(LDFLAGS_$(os)))) $(eval tags = $(GO_BUILD_TAGS) $(GO_BUILD_TAGS_$(os)) $(GO_BUILD_TAGS_$(os)_$(arch))) - GOOS=$(os) GOARCH=$(arch) CGO_ENABLED=1 go build -mod="vendor" -tags "$(tags)" -ldflags "$(ldflags)" -o $@ ./cmd/skaffold + CGO_ENABLED=1 go build -mod="vendor" -tags "$(tags)" -ldflags "$(ldflags)" -o $@ ./cmd/skaffold (cd `dirname $@`; shasum -a 256 `basename $@`) | tee $@.sha256 file $@ || true diff --git a/vendor/github.com/buildpacks/pack/Makefile b/vendor/github.com/buildpacks/pack/Makefile index 020ef4954af..80cacd1c443 100644 --- a/vendor/github.com/buildpacks/pack/Makefile +++ b/vendor/github.com/buildpacks/pack/Makefile @@ -58,7 +58,7 @@ BINDIR:=/usr/bin/ ## build: Build the program build: out @echo "=====> Building..." - $(GOCMD) build -ldflags "-s -w -X 'github.com/buildpacks/pack.Version=${PACK_VERSION}' '-extldflags ${LDFLAGS}'" -trimpath -o ./out/$(PACK_BIN) -a ./cmd/pack + $(GOCMD) build -ldflags "-s -w -X 'github.com/buildpacks/pack.Version=${PACK_VERSION}' -extldflags '${LDFLAGS}'" -trimpath -o ./out/$(PACK_BIN) -a ./cmd/pack ## all: Run clean, verify, test, and build operations all: clean verify test build