Skip to content

Commit

Permalink
TUN-8146: Fix export path for install-go command
Browse files Browse the repository at this point in the history
This should fix homebrew-core to use the correct go tool chain
  • Loading branch information
chungthuang authored and joliveirinha committed Jan 11, 2024
1 parent 8d9aab5 commit 8fc8c17
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 @@ -49,6 +49,8 @@ PACKAGE_DIR := $(CURDIR)/packaging
PREFIX := /usr
INSTALL_BINDIR := $(PREFIX)/bin/
INSTALL_MANDIR := $(PREFIX)/share/man/man1/
CF_GO_PATH := /tmp/go
PATH := $(CF_GO_PATH)/bin:$(PATH)

LOCAL_ARCH ?= $(shell uname -m)
ifneq ($(GOARCH),)
Expand Down Expand Up @@ -166,12 +168,12 @@ test-ssh-server:

.PHONY: install-go
install-go:
rm -rf ${CF_GO_PATH}
./.teamcity/install-cloudflare-go.sh
export PATH="tmp/go/bin:${PATH}"

.PHONY: cleanup-go
cleanup-go:
rm -rf /tmp/go
rm -rf ${CF_GO_PATH}

cloudflared.1: cloudflared_man_template
sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' cloudflared_man_template > cloudflared.1
Expand Down

0 comments on commit 8fc8c17

Please sign in to comment.