Skip to content

Commit

Permalink
Fixing psst to build on x86_64 properly
Browse files Browse the repository at this point in the history
  • Loading branch information
theturtle32 committed Aug 25, 2022
1 parent afada9f commit 0bfcc4c
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@
VERSION=$(shell git tag -l --points-at HEAD)
COMMIT=$(shell git rev-parse HEAD)
REPO="github.com/dollarshaveclub/psst"
NATIVE_PLATFORM=`uname -m`
GOARCH=$(shell [ $(NATIVE_PLATFORM) = 'x86_64' ] && echo "amd64" || echo $(NATIVE_PLATFORM) )

all: clean bin/psst

install:
go install -ldflags "-X $(REPO)/internal/version.CommitSHA=$(COMMIT) -X $(REPO)/internal/version.Version=$(VERSION)" .

build-dsc:
GOOS=darwin GOARCH=`uname -m` go build -ldflags "-X $(REPO)/cmd.Version=$(VERSION) -X $(REPO)/cmd.CommitSHA=$(COMMIT) -X $(REPO)/cmd.CompiledDirectory=github -X $(REPO)/cmd.CompiledStorage=vault -X $(REPO)/cmd.Org=dollarshaveclub" -o bin/dsc/darwin/psst .
GOOS=darwin GOARCH=$(GOARCH) go build -ldflags "-X $(REPO)/cmd.Version=$(VERSION) -X $(REPO)/cmd.CommitSHA=$(COMMIT) -X $(REPO)/cmd.CompiledDirectory=github -X $(REPO)/cmd.CompiledStorage=vault -X $(REPO)/cmd.Org=dollarshaveclub" -o bin/dsc/darwin/psst .

build-all:
GOOS=darwin GOARCH=`uname -m` go build -ldflags "-X $(REPO)/cmd.Version=$(VERSION) -X $(REPO)/cmd.CommitSHA=$(COMMIT)" -o bin/psst-darwin .
GOOS=darwin GOARCH=$(GOARCH) go build -ldflags "-X $(REPO)/cmd.Version=$(VERSION) -X $(REPO)/cmd.CommitSHA=$(COMMIT)" -o bin/psst-darwin .

release:
cd releaser && go build && ./releaser --commit "$(COMMIT)" --release "${RELEASE}"
Expand Down

0 comments on commit 0bfcc4c

Please sign in to comment.